-
Notifications
You must be signed in to change notification settings - Fork 3
/
Copy pathindex.html
562 lines (466 loc) · 20.3 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
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Git</title>
<meta name="description" content="A completely childish person with no manners">
<meta name="author" content="Alexander Groß">
<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]-->
<link href="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAxTO0AMUztADFN7gAxTe4AMU3uADFN7wAxTe8AMk3w/zJN8P8yTvEAMk7xADJO8gAyTvIAMk7zAP///wD///8AMUztADFN7gAxTe4AMU3uADFN7wAxTe8AMk3w/zJN8P8yTvH/Mk7x/zJO8gAyTvIAMk7zADJO8wD///8A////ADFN7gAxTe4AMU3uADFN7wAxTe8AMk3w/zJN8P8yTvH/Mk7x/zJO8v8yTvL/Mk7zADJO8wAyT/QA////AP///wAxTe4AMU3uADFN7wAxTe8AMk3w/zJN8P8yTvH/Mk7x9TJO8vYyTvL/Mk7z/zJO8/8yT/QAM0/1AP///wD///8AMU3uADFN7wAxTe8AMk3w/zJN8P8yTvH/Mk7x/zJO8gAyTvIAMk7z/zJO8/8yT/T/M0/1/zNP9QD///8A////ADFN7wAxTe8AMk3w/zJN8P8yTvH/Mk7x/zJO8v8yTvIAMk7zADJO8/8yT/T/M0/1/zNP9f8zT/b/////AP///wAxTe8AMk3w/zJN8P8yTvH/Mk7x/zJO8v8yTvL/Mk7zNzJO8zcyT/T/M0/1/zNP9f8zT/b/M0/2/zNQ9/////8AMk3w/zJN8P8yTvH/Mk7x/zJO8v8yTvL/Mk7z/zJO8zcyT/Q3M0/1/zNP9QAzT/YAM0/29jNQ9/8zUPf/M1D4/zJN8P8yTvH/Mk7x/zJO8v8yTvL/Mk7z/zJO8/8yT/Q3M0/1NzNP9f8zT/YAM0/2ADNQ9/UzUPf/M1D4/zNQ+f8yTvEAMk7x/zJO8v8yTvL/Mk7z/zJO8/8yT/T/M0/1NzNP9TczT/YAM0/2ADNQ9/8zUPf/M1D4/zNQ+f////8AMk7xADJO8gAyTvL/Mk7z/zJO8/8yT/T/M0/1/zNP9QAzT/YAM0/2ADNQ9/8zUPj/M1D4/zNQ+f////8A////ADJO8gAyTvIAMk7zADJO8/8yT/T/M0/1/zNP9f8zT/YAM0/2ADNQ9/8zUPj/M1D4/zNQ+f8zUPkA////AP///wAyTvIAMk7zADJO8wAyT/QAM0/1/zNP9f8zT/YAM0/2aDNQ9/QzUPf/M1D4/zNQ+f8zUPkANFD6AP///wD///8AMk7zADJO8wAyT/QAM0/1ADNP9QAzT/YAM0/2OjNQ9/8zUPf/M1D4/zNQ+f8zUPkANFD6ADRR+gD///8A////ADJO8wAyT/QAM0/1ADNP9QAzT/YAM0/2ADNQ9/8zUPf/M1D4/zNQ+f8zUPkANFD6ADRR+gA0UfoA////AP///wAyT/QAM0/1ADNP9QAzT/YAM0/2ADNQ9wAzUPgAM1D4/zNQ+f8zUPkANFD6ADRR+gA0UfoANFH7AP///wD///8A/n8AAPw/AAD4HwAA8A8AAOGHAADBgwAAgYEAAAGwAAABsAAAgeEAAMHDAADhhwAA8w8AAP4fAAD8PwAA/n8AAA==" rel="icon" type="image/x-icon">
</head>
<body>
<div class="reveal">
<!-- Any section element inside of this container is displayed as a slide -->
<div class="slides">
<section>
<img src="images/git-logo.png" alt="Git logo">
<h3>Commit often, perfect later, publish once</h3>
</section>
<section>
<section>
<h1>Warum git?</h1>
</section>
<section>
<h2>Etwas Historie</h2>
</section>
<section>
<img src="images/linus-torvalds.jpeg" alt="Linus Torvalds">
<aside class="notes">
"Linus Torvalds" by Unknown photographer who sold rights to the picture to linuxmag.com - Linuxmag.com; The image is from an article in a December 2002 issue of Linux Magazine[1]. Licensed under CC BY-SA 3.0 via Wikimedia Commons - http://commons.wikimedia.org/wiki/File:Linus_Torvalds.jpeg#/media/File:Linus_Torvalds.jpeg
</aside>
</section>
<section>
<img src="images/tux.png" alt="Tux">
<aside class="notes">
"Tux" by Larry Ewing [1] - image sourcedrawing description. Via Wikimedia Commons - http://commons.wikimedia.org/wiki/File:Tux.png#/media/File:Tux.png
</aside>
</section>
<section>
<img src="images/git-logo.png" alt="Git logo">
<blockquote>
A completely ignorant, childish person with no manners.
<footer>
<cite>— <a href="http://www.urbandictionary.com/define.php?term=Git" target="_blank">Urban Dictionary</a></cite>
</footer>
</blockquote>
</section>
</section>
<section>
<section>
<h1>8 Gründe</h1>
</section>
</section>
<section>
<section>
<h2>1. Git ist ein <em>verteiltes</em> Versionskontollsystem<sup>*</sup></h2>
<p>* es unterstützt die Arbeit der Entwickler</p>
</section>
<section data-background="#2b2b2b">
<img src="images/subversion-logo.svg" alt="Subversion logo">
</section>
<section data-background="#2b2b2b">
<img src="images/centralized-vcs.png" alt="Centralized VCS">
</section>
<section style="margin-top: -50px;" data-transition="linear">
<img src="images/distributed-vcs.png" alt="Distributed VCS">
</section>
<section data-background="images/offline.jpg">
<aside class="notes">http://www.flickr.com/photos/saschaaa/152502539/</aside>
</section>
<section>
<ul>
<li>git funktioniert offline<br>
…und ist deshalb <strong>schnell</strong></li>
<li>Die Veröffentlichung von Änderungen ist explizit<br>
…und erlaubt deshalb <strong>Korrekturen</strong></li>
<li>Die Mitarbeit ist Open Source ist einfacher geworden<br>
…was auch für Unternehmen profitabel ist</li>
</ul>
</section>
</section>
<section>
<section>
<h2>2. Git basiert auf einem <em>simplen</em> Grundprinzip<sup>*</sup></h2>
<p>* das mathematisch beschrieben ist</p>
</section>
<section>
<h3>Eine Änderung ist ein Commit</h3>
<img src="images/internals/simple-commit-object.png">
</section>
<section>
<h3>Historie ist eine Folge von Commits</h3>
<img src="images/internals/simple-commit-history.png">
</section>
<section>
<h3>Branches sind Zeiger auf einen Commit</h3>
<img src="images/internals/branch-and-history-without-HEAD.png">
</section>
<section>
<h3>Wir bauen uns einen Graphen</h3>
<img src="images/branching/rebase-onto-1.png">
<p class="fragment">* einen gerichteten azyklischen Graphen</p>
</section>
</section>
<section>
<section>
<h2>3. Branching (und Merging) ist einfach<sup>*</sup></h2>
<p>* auch ohne Administratoren</p>
</section>
<section>
<pre style="margin-top: 1em"><span style="color: #00CC00">agross@FIRIEL</span> <span style="color: #BFBF00">/work/grossweber-website/</span> <span style="color: #00CC00">(master)</span>
$ git branch -a
<span style="color: #00CC00"> experimental/accessing-compiled-content
experimental/progressive-jpeg
experimental/webfont-search-button
feature/ab-testing
feature/geo
* <span style="color: #000000; background-color: #00CC00">master</span>
upgrade/nsb5</span>
<span style="color: #CC0000"> remotes/origin/HEAD</span> -> origin/master
<span style="color: #CC0000"> remotes/origin/feature/ab-testing
remotes/origin/master</span></pre>
</section>
<section>
<ul>
<li>Branches sind zunächst <strong>lokal</strong></li>
<li>Branches sind <strong>billig</strong></li>
<li>gits Mergealgorithmus wurde mithilfe des Linux Kernel-Source <strong>feinabgestimmt</strong></li>
</ul>
</section>
</section>
<section>
<section>
<h2>4. Korrekturen<sup>*</sup> sind möglich</h2>
<p>* jederzeit korrigieren zu können ist wunderbar</p>
</section>
<section>
<h3>Wem kommt das bekannt vor?</h3>
</section>
<section>
<blockquote>
Ich habe vergessen eine Datei zu committen!
<footer>
<cite>— Alexander Groß</cite>
</footer>
</blockquote>
<img class="fragment" src="images/facepalm-1.jpg" alt="Facepalm">
</section>
<section>
<blockquote>
Ich habe mich in der Commit Message vertippt!
<footer>
<cite>— Alexander Groß</cite>
</footer>
</blockquote>
<img src="images/facepalm-2.jpg" alt="Facepalm" style="height: 500px">
</section>
<section>
<blockquote>
Der letzte Commit war doch keine so gute Idee!
<footer>
<cite>— Alexander Groß</cite>
</footer>
</blockquote>
<img src="images/facepalm-3.gif" alt="Facepalm">
</section>
<section>
<blockquote>
Jetzt habe ich 3 Anläufe für den Bugfix benötigt!
<footer>
<cite>— Alexander Groß</cite>
</footer>
</blockquote>
<img src="images/facepalm-4.jpg" alt="Facepalm">
</section>
<section>
<h3>All das (und mehr) lässt sich korrigieren!<sup>*</sup></h3>
<p>* git besitzt unzählige <strong>Sicherheitsvorkehrungen</strong> um bspw. Korrekturen mehrfach durchführen zu können</p>
</section>
<section data-background="images/futurama-fry.jpg">
</section>
<section>
<h3>...um eine <em>Geschichte</em> zu erzählen</h3>
<ul>
<li>Geschichten kürzen ab</li>
<li>Geschichten beschönigen tatsächliche Ereignisse</li>
<li><strong>Geschichten sind verständlich</strong></li>
</ul>
</section>
</section>
<section>
<section>
<h2>5. git schreibt keinen Workflow vor<sup>*</sup></h2>
<p>* wie wäre es <em>nur das Beste</em> für sich zu wählen</p>
</section>
<section>
<h3>Branches zur Isolation</h3>
<img src="images/branching-strategies/feature-branches.png" alt="Topic Branches">
</section>
<section>
<h3><a href="http://nvie.com/posts/a-successful-git-branching-model/" target="_blank">git-flow</a></h3>
<a href="images/branching-strategies/gitflow.png" target="_blank"><img src="images/branching-strategies/gitflow.png"></a>
</section>
<section>
<h3>Serverseitige Repositories<sup>*</sup></h3>
<p>* warum eins wenn man auch mehr haben kann</p>
<img src="images/cats.jpg" alt="Cats" style="height: 500px">
</section>
<section>
<h3>Zentralisiert<sup>*</sup></h3>
<p>* vermutlich das was Sie jetzt im Einsatz haben</p>
<img src="images/workflow/centralized.png" alt="Centralized workflow">
</section>
<section>
<h3>Integration Manager</h3>
<img src="images/workflow/integration-manager.png" alt="Integration manager">
</section>
<section>
<h3>Benevolent Dictator</h3>
<img src="images/workflow/benevolent-dictator.png" alt="Benevolent dictator">
</section>
</section>
<section>
<section>
<h2>6. git funktioniert überall<sup>*</sup></h2>
<p>* Windows, Linux, Mac, Konsole, IDE</p>
<img class="fragment" src="images/command-line-works.png" alt="Use the bloody command line. It works!">
</section>
</section>
<section>
<section>
<h2>7. git ist ein Skalpell<sup>*</sup></h2>
<p>* mit dem man sich nicht schneiden kann</p>
</section>
<section>
<h3>Wie wäre es die Korrekutur der <em>Reis</em>kostenabrechnung separat zu releasen?</h3>
<pre style="margin-top: 1em">$ git diff -- dokumentation.txt
<span style="color: #7F7F7F">...</span>
Foobar HR
Module in der aktuellen Version von Foobar HR:
* Personalabrechnung
<span style="color: #CC0000">- * Reiskostenabrechnung</span>
<span style="color: #00CC00">+ * Reisekostenabrechnung</span>
* Zeitwirtschaft
* Bewerbermanagement
<span style="color: #00CC00">+ * Zielvereinbarungen</span>
<span style="color: #00CC00">+ * digitale Personalakte</span>
</pre>
</section>
</section>
<section>
<section>
<h2>8. git ist sehr gut dokumentiert</h2>
</section>
<section>
<h3>Von Experten geschrieben</h3>
<a href="http://git-scm.com/docs" target="_blank"><img src="images/docs/le-petit-robert.png" alt="Le petit Robert" style="height: 400px"></a>
<blockquote style="margin-top: 0">
git-rebase - Forward-port local commits to the updated upstream head
<footer>
<cite>— <a href="http://git-scm.com/docs/git-rebase" target="_blank">git-rebase</a> <a href="http://git-scm.com/docs" target="_blank">manpage</a></cite>
</footer>
</blockquote>
</section>
<section>
<a href="http://git-scm.com/book/en/v2" target="_blank"><img src="images/docs/pro-git.png" alt="Pro Git"></a>
</section>
</section>
<section>
<section>
<h1 style="text-align: left; margin-left: 1.8em;">Optionen, Optionen...</h1>
</section>
<section>
<a href="http://grossweber.com"><img src="images/grossweber/logo.png" alt="GROSSWEBER Logo"></a><br>
<blockquote>
Git schneidet bei Source Control so gut ab wie ein scharfes japanisches Messer bei einem Steak.
<footer>
<cite>— Uwe Zimmermann, Leiter Entwicklung, iCamSystems GmbH</cite>
</footer>
</blockquote>
<blockquote>
Wir denken jetzt mehr in Git als in SVN.
<footer>
<cite>— Michael Leßnau, Softwareentwickler, SAGE HR Solutions AG</cite>
</footer>
</blockquote>
</section>
</section>
<section>
<section>
<h1>Hallo, git</h1>
</section>
<section>
<pre>$ git <verb></pre>
<pre>$ git help <verb>
$ git <verb> --help</pre>
</section>
<section>
<pre>$ git init
Initialized empty Git repository in /scratch/.git/
$ echo hello, world > hello.txt
$ git add hello.txt
$ git commit -m "my first commit!"
[master (root-commit) ad9a291] my first commit!
1 file changed, 1 insertion(+)
create mode 100644 hello.txt</pre>
</section>
<section>
<pre>$ git log --patch
<span style="color: #BFBF00">commit ad9a291416165bb95a541321a7acf9cef9731c1d</span>
Author: Alexander Groß <[email protected]>
Date: Sat Feb 6 12:41:24 2010 +0100
my first commit!
<span style="color: #7F7F7F">diff --git a/hello.txt b/hello.txt
new file mode 100644
index 0000000..4b5fa63
--- /dev/null
+++ b/hello.txt</span>
<span style="color: #1FAECD">@@ -0,0 +1 @@</span>
<span style="color: #00CC00">+hello, world</span></pre>
</section>
</section>
<section>
<section>
<h1>Branching</h1>
</section>
<section>
<h2>Einfache Historie</h2>
<img src="images/branching/1-simple-history.png">
</section>
<section>
<h2><code>HEAD</code> ist ein spezieller Zeiger</h2>
<img src="images/branching/2-HEAD.png">
</section>
<section>
<h2>Einen Branch erzeugen</h2>
<pre>$ git branch testing <where></pre>
<small>(<code><where></code> ist standardmäßig der Commit auf den <code>HEAD</code> zeigt)</small>
<img src="images/branching/3-create-branch.png">
</section>
<section>
<h2>Den Branch wechseln</h2>
<pre>$ git checkout testing</pre>
<img src="images/branching/4-switch-branch.png">
</section>
<section>
<h2>Einen Commit auf <code>testing</code> erzeugen</h2>
<pre>$ git commit -am "work on testing"</pre>
<img src="images/branching/5-advance-testing.png">
</section>
<section>
<h2>Zurück auf <code>master</code></h2>
<pre>$ git checkout master</pre>
<img src="images/branching/6-back-to-master.png">
</section>
<section>
<h2>Einen Commit auf <code>master</code> erzeugen</h2>
<pre>$ git commit -am "work on master"</pre>
<img src="images/branching/7-advance-master.png">
</section>
</section>
<section>
<section>
<h1>Integration</h1>
</section>
<section>
<h2>Divergente Historie</h2>
<img src="images/integration/diverged-history.png">
</section>
<section id="merge">
<h2>Integration mit <code>git merge</code></h2>
<pre>$ git checkout <span style="color: #F44D27">master</span>
$ git merge experiment</pre>
<img src="images/integration/diverged-history-merge.png">
<small>C5 bringt beide Branches zusammen.</small>
</section>
<section id="rebase">
<h2>Linearisierung mit <code>git rebase</code></h2>
<pre>$ git checkout <span style="color: #F44D27">experiment</span>
$ git rebase master</pre>
<img src="images/integration/diverged-history-rebase.png">
<small>Eine Kopie von <code>C4</code> wird auf <code>master</code> als <code>C4'</code> angewendet.</small>
</section>
<section>
<h2>Noch mehr Möglichkeiten</h2>
<ul>
<li>
<code>git cherry-pick <SHA></code><br>
<small>Einen Commit direkt anwenden.</small>
</li>
<li>
<code>git merge --squash topic</code><br>
<small>Zusammenführen aller Commits eines Branches zu einem Commit auf dem aktuellen Branch.</small>
</li>
<li>
<code>git merge feature/login bugfix/42 experiment/foo</code><br>
<small>Mehrere Branches mit einem Merge-Commit integrieren.</small>
</li>
<li>…und noch mehr ;-)</li>
</ul>
</section>
</section>
<section>
<h1>Vielen Dank! :-)</h1>
<br>
<a href="http://grossweber.com/git">grossweber.com/git</a>
</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({
// The "normal" size of the presentation, aspect ratio will be preserved
// when the presentation is scaled to fit different resolutions. Can be
// specified using percentage units.
width: 1100,
height: 768,
// Factor of the display size that should remain empty around the content
margin: 0.1,
// Bounds for smallest/largest possible scale to apply to content
minScale: 0.2,
maxScale: 1.0,
controls: true,
progress: true,
history: true,
center: true,
theme: Reveal.getQueryHash().theme || 'simplest', // available themes are in /css/theme
transition: Reveal.getQueryHash().transition || 'linear', // default/cube/page/concave/zoom/linear/fade/none
backgroundTransition: 'slide', // default/none/slide/concave/convex/zoom
// 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>