-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathindex.html
192 lines (167 loc) · 5.7 KB
/
index.html
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Jinkubator #21 - Git</title>
<meta name="author" content="Adam Ruka" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<link rel="stylesheet" href="css/reveal.min.css">
<link rel="stylesheet" href="css/theme/default.css" id="theme">
<!-- For syntax highlighting -->
<link rel="stylesheet" href="lib/css/zenburn.css">
<!-- If the query includes 'print-pdf', include the PDF print sheet -->
<script>
if (window.location.search.match(/print-pdf/gi)) {
var link = document.createElement('link');
link.rel = 'stylesheet';
link.type = 'text/css';
link.href = 'css/print/pdf.css';
document.getElementsByTagName('head')[0].appendChild(link);
}
</script>
<!--[if lt IE 9]>
<script src="lib/js/html5shiv.js"></script>
<![endif]-->
</head>
<body>
<div class="reveal">
<!-- Any section element inside of this container is displayed as a slide -->
<div class="slides">
<section>
<h3>Git</h3>
<img src="git-logo.png">
<h4>Jinkubator #21</h4>
</section>
<section>
<h5>WhoAmI</h5>
<ul>
<li>Adam Ruka</li>
<li>Twitter @adam_ruka</li>
<li>blog endoflineblog.com</li>
<li>software developer at Pragmatists
<ul>
<li>we love Agile and XP</li>
<li>we're permanently hiring</li>
</ul>
</li>
</ul>
<img src="pragmatists-logo.png">
</section>
<section>
<img src="git-all-the-things.png">
</section>
<section>
<h5>Agenda</h5>
<ol>
<li>comparison between Centralized VCS and Distributed VCS</li>
<li>Git concepts in analogy to its SVN counterparts</li>
<li>console usage & basic workflow</li>
<li>visual tools & IDE integration</li>
<li>GitHub</li>
<li>Advanced workflows. Branching. Merging. GitFlow.</li>
<li>some advanced topics - aliases, remotes, rebasing</li>
<li>whatever YOU want</li>
</ol>
</section>
<section>
<h5>Traditional Version Control Systems</h5>
<p>
<img src="cvcs-design.png">
</p>
</section>
<section>
<h5>Distributed Version Control Systems</h5>
<p>
<img src="dvcs-design.png">
</p>
</section>
<section>
<h5>Typical SVN workflow</h5>
<ol>
<li><code>checkout</code></li>
<li>do some work...</li>
<li><code>commit</code></li>
<li>if somebody commited in the mean time - <code>update</code>, then go to 3.</li>
</ol>
</section>
<section>
<h5>Typical Git workflow</h5>
<ol>
<li><code>clone</code></li>
<li>do some work...</li>
<li><code>add</code> to index</li>
<li><code>commit</code></li>
<li><code>push</code></li>
<li>if somebody commited in the mean time - <code>pull</code>, then go to 5.</li>
</ol>
</section>
<section>
<p>
<img src="github-logo.jpg">
</p>
</section>
<section>
<h5>Branches</h5>
<p>
<img src="branching.jpeg" style="width: 200%;">
</p>
</section>
<section>
<h5>GitFlow</h5>
<p>
<img src="gitflow.png">
</p>
</section>
<section>
<h5>Rebasing</h5>
<p>
<img src="rebasing.jpeg" style="width: 75%;">
</p>
</section>
<section>
<h5>Recommended reading</h5>
<p>
"Pro Git" by Scott Chacon, available for free on the Git SCM page (<a href="http://git-scm.com/book/en/v2">http://git-scm.com/book/en/v2</a>).
</p>
<p>
After reading (and understanding!) the first three chapters, you should be an advanced Git user.
</p>
</section>
<section>
<h5>Thank you</h5>
<p>
Free-for-all section
</p>
</section>
</div>
</div>
<script src="lib/js/head.min.js"></script>
<script src="js/reveal.min.js"></script>
<script>
// Full list of configuration options available here:
// https://github.com/hakimel/reveal.js#configuration
Reveal.initialize({
controls: false,
progress: false,
history: true,
center: true,
theme: 'pragmatists', // available themes are in /css/theme
transition: 'none',
// Parallax scrolling
// parallaxBackgroundImage: 'https://s3.amazonaws.com/hakim-static/reveal-js/reveal-parallax-1.jpg',
// parallaxBackgroundSize: '2100px 900px',
// Optional libraries used to extend on reveal.js
dependencies: [
{ src: 'lib/js/classList.js', condition: function() { return !document.body.classList; } },
{ src: 'plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
{ src: 'plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
{ src: 'plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
{ src: 'plugin/zoom-js/zoom.js', async: true, condition: function() { return !!document.body.classList; } },
{ src: 'plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } }
]
});
</script>
</body>
</html>