orgmode-cli-tools 0.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/.gitignore +4 -0
- data/Gemfile +4 -0
- data/Gemfile.lock +29 -0
- data/README.MD +67 -0
- data/Rakefile +7 -0
- data/bin/org2html +66 -0
- data/bin/org2revealjs +116 -0
- data/lib/orgmode_cli_tools.rb +6 -0
- data/orgmode-cli-tools.gemspec +26 -0
- data/pkg/orgmode-cli-tools-0.0.1.gem +0 -0
- data/pkg/orgmode-cli-tools-0.1.0.gem +0 -0
- data/templates/reveal_js_template/css/FMtZSYIYoYw.ttf +0 -0
- data/templates/reveal_js_template/css/LqowQDslGv4DmUBAfWa2Vw.ttf +0 -0
- data/templates/reveal_js_template/css/cDxXwCLxiixG1c.ttf +0 -0
- data/templates/reveal_js_template/css/google-fonts.css +24 -0
- data/templates/reveal_js_template/css/main.css +909 -0
- data/templates/reveal_js_template/css/print/paper.css +170 -0
- data/templates/reveal_js_template/css/print/pdf.css +158 -0
- data/templates/reveal_js_template/css/theme/beige.css +179 -0
- data/templates/reveal_js_template/css/theme/default.css +169 -0
- data/templates/reveal_js_template/css/theme/simple.css +164 -0
- data/templates/reveal_js_template/css/v0SdcGFAl2aezM9Vq_aFTQ.ttf +0 -0
- data/templates/reveal_js_template/images/gitorious-org.png +0 -0
- data/templates/reveal_js_template/index.html +231 -0
- data/templates/reveal_js_template/js/reveal.js +1131 -0
- data/templates/reveal_js_template/js/reveal.min.js +70 -0
- data/templates/reveal_js_template/lib/css/zenburn.css +115 -0
- data/templates/reveal_js_template/lib/font/league_gothic-webfont.eot +0 -0
- data/templates/reveal_js_template/lib/font/league_gothic-webfont.svg +230 -0
- data/templates/reveal_js_template/lib/font/league_gothic-webfont.ttf +0 -0
- data/templates/reveal_js_template/lib/font/league_gothic-webfont.woff +0 -0
- data/templates/reveal_js_template/lib/font/league_gothic_license +2 -0
- data/templates/reveal_js_template/lib/js/classList.js +2 -0
- data/templates/reveal_js_template/lib/js/data-markdown.js +27 -0
- data/templates/reveal_js_template/lib/js/head.min.js +8 -0
- data/templates/reveal_js_template/lib/js/highlight.js +5 -0
- data/templates/reveal_js_template/lib/js/html5shiv.js +7 -0
- data/templates/reveal_js_template/lib/js/showdown.js +1341 -0
- data/templates/reveal_js_template/package.json +20 -0
- metadata +150 -0
@@ -0,0 +1,169 @@
|
|
1
|
+
/**
|
2
|
+
* The default theme for reveal.js presentations.
|
3
|
+
*
|
4
|
+
* Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se
|
5
|
+
*/
|
6
|
+
|
7
|
+
/*********************************************
|
8
|
+
* FONT-FACE DEFINITIONS
|
9
|
+
*********************************************/
|
10
|
+
|
11
|
+
@font-face {
|
12
|
+
font-family: 'League Gothic';
|
13
|
+
src: url('../../lib/font/league_gothic-webfont.eot');
|
14
|
+
src: url('../../lib/font/league_gothic-webfont.eot?#iefix') format('embedded-opentype'),
|
15
|
+
url('../../lib/font/league_gothic-webfont.woff') format('woff'),
|
16
|
+
url('../../lib/font/league_gothic-webfont.ttf') format('truetype'),
|
17
|
+
url('../../lib/font/league_gothic-webfont.svg#LeagueGothicRegular') format('svg');
|
18
|
+
|
19
|
+
font-weight: normal;
|
20
|
+
font-style: normal;
|
21
|
+
}
|
22
|
+
|
23
|
+
|
24
|
+
/*********************************************
|
25
|
+
* GLOBAL STYLES
|
26
|
+
*********************************************/
|
27
|
+
|
28
|
+
body {
|
29
|
+
font-family: 'Lato', Times, 'Times New Roman', serif;
|
30
|
+
font-size: 36px;
|
31
|
+
font-weight: 200;
|
32
|
+
letter-spacing: -0.02em;
|
33
|
+
color: #eee;
|
34
|
+
|
35
|
+
background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPHJhZGlhbEdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgY3g9IjUwJSIgY3k9IjUwJSIgcj0iNzUlIj4KICAgIDxzdG9wIG9mZnNldD0iMCUiIHN0b3AtY29sb3I9IiM1NTVhNWYiIHN0b3Atb3BhY2l0eT0iMSIvPgogICAgPHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjMWMxZTIwIiBzdG9wLW9wYWNpdHk9IjEiLz4KICA8L3JhZGlhbEdyYWRpZW50PgogIDxyZWN0IHg9Ii01MCIgeT0iLTUwIiB3aWR0aD0iMTAxIiBoZWlnaHQ9IjEwMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
|
36
|
+
background-color: #2b2b2b;
|
37
|
+
background: -moz-radial-gradient(center, ellipse cover, rgba(85,90,95,1) 0%, rgba(28,30,32,1) 100%);
|
38
|
+
background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(0%,rgba(85,90,95,1)), color-stop(100%,rgba(28,30,32,1)));
|
39
|
+
background: -webkit-radial-gradient(center, ellipse cover, rgba(85,90,95,1) 0%,rgba(28,30,32,1) 100%);
|
40
|
+
background: -o-radial-gradient(center, ellipse cover, rgba(85,90,95,1) 0%,rgba(28,30,32,1) 100%);
|
41
|
+
background: -ms-radial-gradient(center, ellipse cover, rgba(85,90,95,1) 0%,rgba(28,30,32,1) 100%);
|
42
|
+
background: radial-gradient(center, ellipse cover, rgba(85,90,95,1) 0%,rgba(28,30,32,1) 100%);
|
43
|
+
}
|
44
|
+
|
45
|
+
|
46
|
+
/*********************************************
|
47
|
+
* HEADERS
|
48
|
+
*********************************************/
|
49
|
+
|
50
|
+
.reveal h1,
|
51
|
+
.reveal h2,
|
52
|
+
.reveal h3,
|
53
|
+
.reveal h4,
|
54
|
+
.reveal h5,
|
55
|
+
.reveal h6 {
|
56
|
+
margin: 0 0 20px 0;
|
57
|
+
color: #eee;
|
58
|
+
font-family: 'League Gothic', Impact, sans-serif;
|
59
|
+
line-height: 0.9em;
|
60
|
+
letter-spacing: 0.02em;
|
61
|
+
|
62
|
+
text-transform: uppercase;
|
63
|
+
text-shadow: 0px 0px 6px rgba(0,0,0,0.2);
|
64
|
+
}
|
65
|
+
|
66
|
+
.reveal h1 {
|
67
|
+
text-shadow: 0 1px 0 #ccc,
|
68
|
+
0 2px 0 #c9c9c9,
|
69
|
+
0 3px 0 #bbb,
|
70
|
+
0 4px 0 #b9b9b9,
|
71
|
+
0 5px 0 #aaa,
|
72
|
+
0 6px 1px rgba(0,0,0,.1),
|
73
|
+
0 0 5px rgba(0,0,0,.1),
|
74
|
+
0 1px 3px rgba(0,0,0,.3),
|
75
|
+
0 3px 5px rgba(0,0,0,.2),
|
76
|
+
0 5px 10px rgba(0,0,0,.25),
|
77
|
+
0 20px 20px rgba(0,0,0,.15);
|
78
|
+
}
|
79
|
+
|
80
|
+
|
81
|
+
/*********************************************
|
82
|
+
* LINKS
|
83
|
+
*********************************************/
|
84
|
+
|
85
|
+
.reveal a:not(.image) {
|
86
|
+
color: hsl(185, 85%, 50%);
|
87
|
+
text-decoration: none;
|
88
|
+
|
89
|
+
-webkit-transition: color .15s ease;
|
90
|
+
-moz-transition: color .15s ease;
|
91
|
+
-ms-transition: color .15s ease;
|
92
|
+
-o-transition: color .15s ease;
|
93
|
+
transition: color .15s ease;
|
94
|
+
}
|
95
|
+
.reveal a:not(.image):hover {
|
96
|
+
color: hsl(185, 85%, 70%);
|
97
|
+
|
98
|
+
text-shadow: none;
|
99
|
+
border: none;
|
100
|
+
border-radius: 2px;
|
101
|
+
}
|
102
|
+
|
103
|
+
.reveal .roll span:after {
|
104
|
+
color: #fff;
|
105
|
+
background: hsl(185, 60%, 35%);
|
106
|
+
}
|
107
|
+
|
108
|
+
|
109
|
+
/*********************************************
|
110
|
+
* IMAGES
|
111
|
+
*********************************************/
|
112
|
+
|
113
|
+
.reveal section img {
|
114
|
+
margin: 30px 0 0 0;
|
115
|
+
background: rgba(255,255,255,0.12);
|
116
|
+
border: 4px solid #eee;
|
117
|
+
|
118
|
+
-webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.15);
|
119
|
+
-moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.15);
|
120
|
+
box-shadow: 0 0 10px rgba(0, 0, 0, 0.15);
|
121
|
+
|
122
|
+
-webkit-transition: all .2s linear;
|
123
|
+
-moz-transition: all .2s linear;
|
124
|
+
-ms-transition: all .2s linear;
|
125
|
+
-o-transition: all .2s linear;
|
126
|
+
transition: all .2s linear;
|
127
|
+
}
|
128
|
+
|
129
|
+
.reveal a:hover img {
|
130
|
+
background: rgba(255,255,255,0.2);
|
131
|
+
border-color: #13DAEC;
|
132
|
+
|
133
|
+
-webkit-box-shadow: 0 0 20px rgba(0, 0, 0, 0.55);
|
134
|
+
-moz-box-shadow: 0 0 20px rgba(0, 0, 0, 0.55);
|
135
|
+
box-shadow: 0 0 20px rgba(0, 0, 0, 0.55);
|
136
|
+
}
|
137
|
+
|
138
|
+
|
139
|
+
/*********************************************
|
140
|
+
* NAVIGATION CONTROLS
|
141
|
+
*********************************************/
|
142
|
+
|
143
|
+
.reveal .controls a {
|
144
|
+
color: #fff;
|
145
|
+
}
|
146
|
+
.reveal .controls a.enabled {
|
147
|
+
color: hsl(185, 85%, 70%);
|
148
|
+
text-shadow: 0px 0px 2px hsla(185, 45%, 70%, 0.3);
|
149
|
+
}
|
150
|
+
|
151
|
+
|
152
|
+
/*********************************************
|
153
|
+
* PROGRESS BAR
|
154
|
+
*********************************************/
|
155
|
+
|
156
|
+
.reveal .progress {
|
157
|
+
background: rgba(0,0,0,0.2);
|
158
|
+
}
|
159
|
+
.reveal .progress span {
|
160
|
+
background: hsl(185, 85%, 50%);
|
161
|
+
|
162
|
+
-webkit-transition: width 800ms cubic-bezier(0.260, 0.860, 0.440, 0.985);
|
163
|
+
-moz-transition: width 800ms cubic-bezier(0.260, 0.860, 0.440, 0.985);
|
164
|
+
-ms-transition: width 800ms cubic-bezier(0.260, 0.860, 0.440, 0.985);
|
165
|
+
-o-transition: width 800ms cubic-bezier(0.260, 0.860, 0.440, 0.985);
|
166
|
+
transition: width 800ms cubic-bezier(0.260, 0.860, 0.440, 0.985);
|
167
|
+
}
|
168
|
+
|
169
|
+
|
@@ -0,0 +1,164 @@
|
|
1
|
+
/**
|
2
|
+
* A simple theme for reveal.js presentations, similar
|
3
|
+
* to the default theme. The accent color is darkblue;
|
4
|
+
* do a find-replace to change it.
|
5
|
+
*
|
6
|
+
* This theme is Copyright (C) 2012 Owen Versteeg, https://github.com/StereotypicalApps. It is MIT licensed.
|
7
|
+
* reveal.js is Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se; so is the theme - beige.css - that this is based off of.
|
8
|
+
*/
|
9
|
+
|
10
|
+
/*********************************************
|
11
|
+
* FONT-FACE DEFINITIONS
|
12
|
+
*********************************************/
|
13
|
+
|
14
|
+
@font-face {
|
15
|
+
font-family: 'League Gothic';
|
16
|
+
src: url('../../lib/font/league_gothic-webfont.eot');
|
17
|
+
src: url('../../lib/font/league_gothic-webfont.eot?#iefix') format('embedded-opentype'),
|
18
|
+
url('../../lib/font/league_gothic-webfont.woff') format('woff'),
|
19
|
+
url('../../lib/font/league_gothic-webfont.ttf') format('truetype'),
|
20
|
+
url('../../lib/font/league_gothic-webfont.svg#LeagueGothicRegular') format('svg');
|
21
|
+
|
22
|
+
font-weight: normal;
|
23
|
+
font-style: normal;
|
24
|
+
}
|
25
|
+
|
26
|
+
/*********************************************
|
27
|
+
* GLOBAL STYLES
|
28
|
+
*********************************************/
|
29
|
+
|
30
|
+
body {
|
31
|
+
font-family: 'Lato', Times, 'Times New Roman', serif;
|
32
|
+
font-size: 36px;
|
33
|
+
font-weight: 200;
|
34
|
+
letter-spacing: -0.02em;
|
35
|
+
color: black !important;
|
36
|
+
|
37
|
+
background: white;
|
38
|
+
}
|
39
|
+
|
40
|
+
::-moz-selection {
|
41
|
+
background:rgba(0, 0, 0, 0.99);
|
42
|
+
color: white;
|
43
|
+
}
|
44
|
+
::-webkit-selection {
|
45
|
+
background:rgba(0, 0, 0, 0.99);
|
46
|
+
color: white;
|
47
|
+
}
|
48
|
+
::selection {
|
49
|
+
background:rgba(0, 0, 0, 0.99);
|
50
|
+
color: white;
|
51
|
+
}
|
52
|
+
|
53
|
+
/*********************************************
|
54
|
+
* HEADERS
|
55
|
+
*********************************************/
|
56
|
+
|
57
|
+
.reveal h1,
|
58
|
+
.reveal h2,
|
59
|
+
.reveal h3,
|
60
|
+
.reveal h4,
|
61
|
+
.reveal h5,
|
62
|
+
.reveal h6 {
|
63
|
+
margin: 0 0 20px 0;
|
64
|
+
color: black;
|
65
|
+
font-family: 'League Gothic', Impact, sans-serif;
|
66
|
+
line-height: 0.9em;
|
67
|
+
letter-spacing: 0.02em;
|
68
|
+
|
69
|
+
text-transform: uppercase;
|
70
|
+
}
|
71
|
+
|
72
|
+
.reveal h1 {
|
73
|
+
border-bottom: 5px dashed black;
|
74
|
+
}
|
75
|
+
|
76
|
+
|
77
|
+
/*********************************************
|
78
|
+
* LINKS
|
79
|
+
*********************************************/
|
80
|
+
|
81
|
+
.reveal a:not(.image) {
|
82
|
+
color: darkblue;
|
83
|
+
text-decoration: none;
|
84
|
+
|
85
|
+
-webkit-transition: color .15s ease;
|
86
|
+
-moz-transition: color .15s ease;
|
87
|
+
-ms-transition: color .15s ease;
|
88
|
+
-o-transition: color .15s ease;
|
89
|
+
transition: color .15s ease;
|
90
|
+
}
|
91
|
+
.reveal a:not(.image):hover {
|
92
|
+
text-shadow: none;
|
93
|
+
border: none;
|
94
|
+
border-radius: 2px;
|
95
|
+
}
|
96
|
+
|
97
|
+
.reveal .roll span:after {
|
98
|
+
color: #fff;
|
99
|
+
background: darkblue;
|
100
|
+
}
|
101
|
+
|
102
|
+
|
103
|
+
/*********************************************
|
104
|
+
* IMAGES
|
105
|
+
*********************************************/
|
106
|
+
|
107
|
+
.reveal section img {
|
108
|
+
margin: 30px 0 0 0;
|
109
|
+
background: rgba(255,255,255,0.12);
|
110
|
+
border: 4px solid #eee;
|
111
|
+
|
112
|
+
-webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.15);
|
113
|
+
-moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.15);
|
114
|
+
box-shadow: 0 0 10px rgba(0, 0, 0, 0.15);
|
115
|
+
|
116
|
+
-webkit-transition: all .2s linear;
|
117
|
+
-moz-transition: all .2s linear;
|
118
|
+
-ms-transition: all .2s linear;
|
119
|
+
-o-transition: all .2s linear;
|
120
|
+
transition: all .2s linear;
|
121
|
+
}
|
122
|
+
|
123
|
+
.reveal a:hover img {
|
124
|
+
background: rgba(255,255,255,0.2);
|
125
|
+
border-color: darkblue;
|
126
|
+
|
127
|
+
-webkit-box-shadow: 0 0 20px rgba(0, 0, 0, 0.55);
|
128
|
+
-moz-box-shadow: 0 0 20px rgba(0, 0, 0, 0.55);
|
129
|
+
box-shadow: 0 0 20px rgba(0, 0, 0, 0.55);
|
130
|
+
}
|
131
|
+
|
132
|
+
|
133
|
+
/*********************************************
|
134
|
+
* NAVIGATION CONTROLS
|
135
|
+
*********************************************/
|
136
|
+
|
137
|
+
.reveal .controls a {
|
138
|
+
color: black;
|
139
|
+
}
|
140
|
+
.reveal .controls a.enabled {
|
141
|
+
color: darkblue;
|
142
|
+
opacity: 1;
|
143
|
+
text-shadow: 0px 0px 2px hsla(185, 45%, 70%, 0.3);
|
144
|
+
}
|
145
|
+
|
146
|
+
|
147
|
+
/*********************************************
|
148
|
+
* PROGRESS BAR
|
149
|
+
*********************************************/
|
150
|
+
|
151
|
+
.reveal .progress {
|
152
|
+
background: rgba(0,0,0,0.2);
|
153
|
+
}
|
154
|
+
.reveal .progress span {
|
155
|
+
background: darkblue;
|
156
|
+
|
157
|
+
-webkit-transition: width 800ms cubic-bezier(0.260, 0.860, 0.440, 0.985);
|
158
|
+
-moz-transition: width 800ms cubic-bezier(0.260, 0.860, 0.440, 0.985);
|
159
|
+
-ms-transition: width 800ms cubic-bezier(0.260, 0.860, 0.440, 0.985);
|
160
|
+
-o-transition: width 800ms cubic-bezier(0.260, 0.860, 0.440, 0.985);
|
161
|
+
transition: width 800ms cubic-bezier(0.260, 0.860, 0.440, 0.985);
|
162
|
+
}
|
163
|
+
|
164
|
+
|
Binary file
|
Binary file
|
@@ -0,0 +1,231 @@
|
|
1
|
+
<!doctype html>
|
2
|
+
<html lang="en">
|
3
|
+
<head>
|
4
|
+
<meta charset="utf-8">
|
5
|
+
<title>How to Git(orious) - Git basics</title>
|
6
|
+
<meta name="author" content="Christian Johansen">
|
7
|
+
<meta name="apple-mobile-web-app-capable" content="yes">
|
8
|
+
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
|
9
|
+
<link href='http://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
|
10
|
+
<link rel="stylesheet" href="css/main.css">
|
11
|
+
<link rel="stylesheet" href="css/theme/default.css">
|
12
|
+
<!-- For syntax highlighting -->
|
13
|
+
<link rel="stylesheet" href="lib/css/zenburn.css">
|
14
|
+
<script>
|
15
|
+
// If the query includes 'print-pdf' we'll use the PDF print sheet
|
16
|
+
document.write( '<link rel="stylesheet" href="css/print/' + ( window.location.search.match( /print-pdf/gi ) ? 'pdf' : 'paper' ) + '.css" type="text/css" media="print">' );
|
17
|
+
</script>
|
18
|
+
<!--[if lt IE 9]>
|
19
|
+
<script src="lib/js/html5shiv.js"></script>
|
20
|
+
<![endif]-->
|
21
|
+
</head>
|
22
|
+
<body>
|
23
|
+
<div class="reveal">
|
24
|
+
<!-- Used to fade in a background when a specific slide state is reached -->
|
25
|
+
<div class="state-background"></div>
|
26
|
+
|
27
|
+
<!-- Any section element inside of this container is displayed as a slide -->
|
28
|
+
<div class="slides">
|
29
|
+
<section>
|
30
|
+
<section data-state="blackout">
|
31
|
+
<h1>How to Git(orious)</h1>
|
32
|
+
<p>Thomas K. Nilsson, thomas@gitorious.com</p>
|
33
|
+
<p>Christian Johansen, christian@gitorious.com</p>
|
34
|
+
</section>
|
35
|
+
<section>
|
36
|
+
<h2>About us</h2>
|
37
|
+
<p><img src="images/gitorious-org.png" alt="Gitorious"/></p>
|
38
|
+
</section>
|
39
|
+
<section>
|
40
|
+
<h2>Goals</h2>
|
41
|
+
<ul>
|
42
|
+
<li class="fragment">Git: <strong class="fragment">D</strong>VCS</li>
|
43
|
+
<li class="fragment">Using Git "like SVN"</li>
|
44
|
+
<li class="fragment">Tracking content the Git way</li>
|
45
|
+
<li class="fragment">Branches and tags</li>
|
46
|
+
<li class="fragment">Merging and rebasing</li>
|
47
|
+
<li class="fragment">Remotes, push and pull</li>
|
48
|
+
<li class="fragment">How Gitorious fits in</li>
|
49
|
+
</ul>
|
50
|
+
</section>
|
51
|
+
<section>
|
52
|
+
<h2>Getting acquainted</h2>
|
53
|
+
<ul>
|
54
|
+
<li>Your name?</li>
|
55
|
+
<li>Experience with Git?</li>
|
56
|
+
<li>Experience with other VCS?</li>
|
57
|
+
<li>Expectations to course</li>
|
58
|
+
</ul>
|
59
|
+
</section>
|
60
|
+
</section>
|
61
|
+
<section>
|
62
|
+
<section data-state="blackout">
|
63
|
+
<h1>Git basics</h1>
|
64
|
+
</section>
|
65
|
+
<section>
|
66
|
+
<h2><strong>De</strong>centralized</h2>
|
67
|
+
<p>The basic principles of distributed version control</p>
|
68
|
+
</section>
|
69
|
+
<section>
|
70
|
+
<h2>Our first Git repository</h2>
|
71
|
+
<pre><code contenteditable>$ mkdir myproject
|
72
|
+
<span class="fragment">$ cd myproject
|
73
|
+
</span><span class="fragment">$ git init .
|
74
|
+
</span><span class="fragment">$ ls -la
|
75
|
+
</span><span class="fragment">total 24
|
76
|
+
drwxrwxr-x. 3 christian christian 4096 Jan 2 14:46 .
|
77
|
+
drwxrwxrwt. 40 christian christian 12288 Jan 2 14:46 ..
|
78
|
+
drwxrwxr-x. 7 christian christian 4096 Jan 2 14:46 .git</span></code></pre>
|
79
|
+
</section>
|
80
|
+
<section>
|
81
|
+
<h2>Status?</h2>
|
82
|
+
<pre><code contenteditable>$ echo "Hello, world" > hello.txt
|
83
|
+
<span class="fragment">$ git status
|
84
|
+
</span><span class="fragment"># On branch master
|
85
|
+
#
|
86
|
+
# Initial commit
|
87
|
+
#
|
88
|
+
# Untracked files:
|
89
|
+
# (use "git add <file>..." to include in what will be committed)
|
90
|
+
#
|
91
|
+
# hello.txt
|
92
|
+
nothing added to commit but untracked files present (use "git add"
|
93
|
+
to track)</span></code></pre>
|
94
|
+
</section>
|
95
|
+
<section>
|
96
|
+
<h2>Git, the SVN way</h2>
|
97
|
+
<pre><code>$ git add hello.txt
|
98
|
+
<span class="fragment">$ # Or like this: `git add .`
|
99
|
+
</span><span class="fragment">$ git commit -m "My first commit"
|
100
|
+
</span><span class="fragment">[master (root-commit) 4894391] My first commit
|
101
|
+
1 file changed, 1 insertion(+)
|
102
|
+
create mode 100644 hello.txt
|
103
|
+
</span><span class="fragment">$ git status
|
104
|
+
</span><span class="fragment"># On branch master
|
105
|
+
nothing to commit (working directory clean)</span></code></pre>
|
106
|
+
</section>
|
107
|
+
<section>
|
108
|
+
<h2>Browsing history</h2>
|
109
|
+
<pre><code contenteditable>$ git log
|
110
|
+
<span class="fragment">commit 4894391c0722cb9dd1d67d49b42717d4455534ef
|
111
|
+
Author: Christian Johansen <christian@cjohansen.no>
|
112
|
+
Date: Wed Jan 2 14:55:24 2013 +0100
|
113
|
+
|
114
|
+
My first commit
|
115
|
+
</span></code></pre>
|
116
|
+
</section>
|
117
|
+
<section>
|
118
|
+
<h2>Inspecting history</h2>
|
119
|
+
<pre><code contenteditable>$ git show 4894391c0722cb9dd1d67d49b42717d4455534ef</code></pre>
|
120
|
+
</section>
|
121
|
+
<section>
|
122
|
+
<h2>Short oid's</h2>
|
123
|
+
<pre><code contenteditable>$ git show 4894391</code></pre>
|
124
|
+
</section>
|
125
|
+
<section>
|
126
|
+
<h2>What's in .git?</h2>
|
127
|
+
<ul>
|
128
|
+
<li class="fragment">objects</li>
|
129
|
+
<li class="fragment">refs</li>
|
130
|
+
</ul>
|
131
|
+
</section>
|
132
|
+
<section>
|
133
|
+
<h2>Tracking more content</h2>
|
134
|
+
<pre><code contenteditable>$ echo "Yes, hello" >> hello.txt
|
135
|
+
<span class="fragment">$ git commit -m "Added more intriguing dialogue"
|
136
|
+
</span><span class="fragment"># On branch master
|
137
|
+
# Changes not staged for commit:
|
138
|
+
# (use "git add <file>..." to update what will be committed)
|
139
|
+
# (use "git checkout -- <file>..." to discard changes in working directory)
|
140
|
+
#
|
141
|
+
# modified: hello.txt
|
142
|
+
#
|
143
|
+
no changes added to commit (use "git add" and/or "git commit -a")</span></code></pre>
|
144
|
+
</section>
|
145
|
+
<section>
|
146
|
+
<h2>Git, the SVN way</h2>
|
147
|
+
<pre><code>$ git commit -am "Added more intriguing dialogue"</code></pre>
|
148
|
+
</section>
|
149
|
+
<section>
|
150
|
+
<h2>The Git way: The staging area</h2>
|
151
|
+
</section>
|
152
|
+
<section data-state="blackout">
|
153
|
+
<h2>Important lesson!</h2>
|
154
|
+
<h1 class="fragment">Git tracks content</h1>
|
155
|
+
<h1 class="fragment"><strong>not</strong> files</h1>
|
156
|
+
</section>
|
157
|
+
<section>
|
158
|
+
<h2>Staging changes</h2>
|
159
|
+
</section>
|
160
|
+
<section>
|
161
|
+
<h2>Interactive stage</h2>
|
162
|
+
</section>
|
163
|
+
<section>
|
164
|
+
<h2>Staging patches</h2>
|
165
|
+
</section>
|
166
|
+
<section>
|
167
|
+
<h2>Staging patches in a GUI</h2>
|
168
|
+
<p>
|
169
|
+
Git's staging area and `git add -p` will change how you
|
170
|
+
use version control. Especially when combined with a UI
|
171
|
+
that makes these features conveniently available.
|
172
|
+
Example with Emacs and Magit.
|
173
|
+
</p>
|
174
|
+
</section>
|
175
|
+
</section>
|
176
|
+
<section>
|
177
|
+
<section data-state="blackout">
|
178
|
+
<h1>Unearthing history</h1>
|
179
|
+
<p>With <code>git-log</code> and <code>git-diff</code></p>
|
180
|
+
</section>
|
181
|
+
<section>
|
182
|
+
<h1>Pretty graphs</h1>
|
183
|
+
<p>With <code>git-log</code></p>
|
184
|
+
</section>
|
185
|
+
</section>
|
186
|
+
<section>
|
187
|
+
<section data-state="blackout">
|
188
|
+
<h1>Locating content</h1>
|
189
|
+
<p>With <code>git-grep</code></p>
|
190
|
+
</section>
|
191
|
+
</section>
|
192
|
+
<section>
|
193
|
+
<section data-state="soothe">
|
194
|
+
<h2>Exercise: Your first Git repository</h2>
|
195
|
+
</section>
|
196
|
+
</section>
|
197
|
+
</div>
|
198
|
+
|
199
|
+
<!-- The navigational controls UI -->
|
200
|
+
<aside class="controls">
|
201
|
+
<a class="left" href="#">◄</a>
|
202
|
+
<a class="right" href="#">►</a>
|
203
|
+
<a class="up" href="#">▲</a>
|
204
|
+
<a class="down" href="#">▼</a>
|
205
|
+
</aside>
|
206
|
+
<!-- Presentation progress bar -->
|
207
|
+
<div class="progress"><span></span></div>
|
208
|
+
</div>
|
209
|
+
<script src="lib/js/head.min.js"></script>
|
210
|
+
<script src="js/reveal.min.js"></script>
|
211
|
+
<script>
|
212
|
+
// Full list of configuration options available here:
|
213
|
+
// https://github.com/hakimel/reveal.js#configuration
|
214
|
+
Reveal.initialize({
|
215
|
+
controls: true,
|
216
|
+
progress: true,
|
217
|
+
history: true,
|
218
|
+
transition: Reveal.getQueryHash().transition || 'linear', // default/cube/page/concave/linear(2d)
|
219
|
+
// Optional libraries used to extend on reveal.js
|
220
|
+
dependencies: [
|
221
|
+
{ src: 'lib/js/highlight.js', async: true, callback: function() { window.hljs.initHighlightingOnLoad(); } },
|
222
|
+
{ src: 'lib/js/classList.js', condition: function() { return !document.body.classList; } },
|
223
|
+
{ src: 'lib/js/showdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
|
224
|
+
{ src: 'lib/js/data-markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
|
225
|
+
{ src: 'socket.io/socket.io.js', async: true, condition: function() { return window.location.host === 'localhost:1947'; } },
|
226
|
+
{ src: 'plugin/speakernotes/client.js', async: true, condition: function() { return window.location.host === 'localhost:1947'; } },
|
227
|
+
]
|
228
|
+
});
|
229
|
+
</script>
|
230
|
+
</body>
|
231
|
+
</html>
|