-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathlearning-git.html
More file actions
551 lines (436 loc) · 9.44 KB
/
learning-git.html
File metadata and controls
551 lines (436 loc) · 9.44 KB
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
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Learning git | March 2010</title>
<!-- metadata -->
<meta name="generator" content="S5" />
<meta name="version" content="S5 1.1" />
<meta name="presdate" content="20050728" />
<meta name="author" content="Mike Canzoneri" />
<meta name="company" content="Synacor" />
<!-- configuration parameters -->
<meta name="defaultView" content="slideshow" />
<meta name="controlVis" content="hidden" />
<!-- style sheet links -->
<link rel="stylesheet" href="ui/black/slides.css" type="text/css" media="projection" id="slideProj" />
<link rel="stylesheet" href="ui/black/outline.css" type="text/css" media="screen" id="outlineStyle" />
<link rel="stylesheet" href="ui/black/print.css" type="text/css" media="print" id="slidePrint" />
<link rel="stylesheet" href="ui/black/opera.css" type="text/css" media="projection" id="operaFix" />
<!-- S5 JS -->
<script src="ui/black/slides.js" type="text/javascript"></script>
</head>
<body>
<div class="layout">
<div id="controls"><!-- DO NOT EDIT --></div>
<div id="currentSlide"><!-- DO NOT EDIT --></div>
<div id="header"></div>
<div id="footer">
<h2>Learning git</h2>
</div>
</div>
<div class="presentation">
<div class="slide">
<h1>Learning git</h1>
<h3>Mike Canz(oneri)</h3>
<h4>(Former) Lead Systems Engineer at Synacor</h4>
<br>
<h4>@mikecanz</h4>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
Propaganda
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
CVS, SVN, ...
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
Now git?
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
Who else is using this?
</span>
</center>
</div>
<div class="slide">
<h1>From Wikipedia</h1>
(Amarok) (Android) (Arch Linux) (Aquamacs Emacs) (BlueZ) (Btrfs) (Clojure) (CakePHP) (Digg) (DragonFly BSD) (Elinks) (Fedora) (FFmpeg) (Freenet) (GIMP) (GNOME) (GPM) (GStreamer) (gThumb) (GTK+) (Hurd) (jQuery) (Laika (EHR testing framework)) (LilyPond (music typesetting)) (Linux kernel) (Linux Mint) (LMMS Music Production Software) (Maemo) (Merb) (MooTools) (One Laptop Per Child (OLPC)) (OpenFOAM) (openSUSE) (Parrot virtual machine) (Perl) (phpBB) (Prototype.js) (Qt) (Reddit) (rsync) (Ruby on Rails) (Samba) (SproutCore) (Sugar) (SWI-Prolog) (VLC) (Wine) (Xiph) (X.org Server) (x264) (YUI)
</div>
<div class="slide">
<h1>From Wikipedia</h1>
(Amarok) (Android) (Arch Linux) (Aquamacs Emacs) (BlueZ) (Btrfs) (Clojure) (CakePHP) (Digg) (DragonFly BSD) (Elinks) (Fedora) (FFmpeg) (Freenet) (GIMP) (GNOME) (GPM) (GStreamer) (gThumb) (GTK+) (Hurd) <span style="color:red">(jQuery)</span> (Laika (EHR testing framework)) (LilyPond (music typesetting)) <span style="color:red">(Linux kernel)</span> (Linux Mint) (LMMS Music Production Software) (Maemo) (Merb) (MooTools) (One Laptop Per Child (OLPC)) (OpenFOAM) (openSUSE) (Parrot virtual machine) <span style="color:red">(Perl)</span> (phpBB) <span style="color:red">(Prototype.js)</span> (Qt) (Reddit) <span style="color:red">(rsync)</span> (Ruby on Rails) <span style="color:red">(Samba)</span> (SproutCore) (Sugar) (SWI-Prolog) (VLC) (Wine) (Xiph) (X.org Server) (x264) (YUI)
</div>
<div class="slide">
Why would we use it?<br>
<ul>
<span class="incremental"><li>Branching<br></span>
<span class="incremental"><li>Sharing<br></span>
<span class="incremental"><li>Teams <span class="incremental">(Branching)</span><br></span>
<span class="incremental"><li>Developing out of order <span class="incremental">(Branching)</span><br></span>
</ul>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
But I heard that git was hard.
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
That's crazy talk.
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
Git is easy.
</span>
</center>
</div>
<div class="slide">
<center>
<img src="pix/Git-transport.png">
</center>
</div>
<div class="slide">
<center>
<img src="pix/git-diagram.png">
</center>
</div>
<div class="slide">
<center>
<img src="pix/dinner.jpg">
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 50px;">
Git is easy in the same way people sitting around a table having a conversation is easy.
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
We lose the forced order of a central system...
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
...but there's a big return.
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 40px;">
A lot of development problems move from a technical space (Can I commit yet?) to a communication space (When will you merge my work?).
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
This is how OS development happened anyway.
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
So...
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
...let us move on.
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
Creating a repo
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
git init
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
Working tree,<br><span class="incremental">index/stage/cache,<span><br><span class="incremental">and history</span>
</span>
</center>
</div>
<div class="slide">
<center>
<img src="pix/gitindex.png">
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
Make a file and add it to the index.
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
Interacting with the index.
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
Commit
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
git log
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
Make a few more commits.
</span>
</center>
</div>
<div class="slide">
<br><br><br>
What does it mean to be a git repo?<br>
<ul>
<span class="incremental"><li>Each repo is a first class citizen.</span>
<span class="incremental"><li>You cause communication to happen.</span>
<span class="incremental"><li>All the history is local.</span>
</ul>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
Where is the repo data?<br>
<span class="incremental">(.git)</span>
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
This is great but we want to work with other people.
</span>
</center>
</div>
<div class="slide">
<center>
<img src='pix/clones.jpg'>
<center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 40px;">
git clone <br> git://github.com/mikecanz/git-training.git
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
Branching
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
git branch
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 50px;">
git checkout -b<br>new_feature<br>origin/master
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
Make some commits.
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
Merge to master
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
Remotes
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
git remote add ALIAS URI
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
This only adds an alias
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
git fetch ALIAS
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
git branch -a
</span>
</center>
</div>
<div class="slide">
<center>
<img src="pix/light-bulb.jpg">
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
End of new concepts.
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
So what did they do?
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
git diff ...REMOTE/BRANCH
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
2 and 3 dot notation.
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
With log it's flipped.
</span>
</center>
</div>
<div class="slide">
<br><br><br>
<center>
<span style="font-size: 70px;">
A word on bit rot.
</span>
</center>
</div>
<div class="slide">
<center>
<img src='pix/highfive.png'>
<center>
</div>
<div class="handout">
[any material that should appear in print but not on the slide]
</div>
</div>
</div>
</body>
</html>