-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathindex.html
More file actions
941 lines (863 loc) · 21.9 KB
/
Copy pathindex.html
File metadata and controls
941 lines (863 loc) · 21.9 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
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
<!DOCTYPE html>
<!--[if lt IE 7]> <html class="no-js ie6" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>Git原理及使用</title>
<meta name="description" content="A jQuery library for modern HTML presentations">
<meta name="author" content="shenfeng">
<meta name="viewport" content="width=1024, user-scalable=no">
<!-- Core and extension CSS files -->
<link rel="stylesheet" href="deck.js/core/deck.core.css">
<link rel="stylesheet" href="deck.js/extensions/goto/deck.goto.css">
<link rel="stylesheet" href="deck.js/extensions/menu/deck.menu.css">
<link rel="stylesheet" href="deck.js/extensions/navigation/deck.navigation.css">
<link rel="stylesheet" href="deck.js/extensions/status/deck.status.css">
<link rel="stylesheet" href="deck.js/extensions/hash/deck.hash.css">
<!-- Theme CSS files (menu swaps these out) -->
<link rel="stylesheet" href="deck.js/themes/style/neon.css">
<link rel="stylesheet" href="deck.js/themes/transition/horizontal-slide.css">
<script src="deck.js/modernizr.custom.js"></script>
</head>
<body class="deck-container">
<section class="slide" id="title-slide">
<h1>Git原理及使用</h1>
</section>
<section class="slide">
<h2>About me</h2>
<ul>
<li>
<h3>神锋</h3>
<p>shenfeng@taobao.com</p>
</li>
<li>
<h3><a href="https://github.com/sdjcw/git-tutorial">https://github.com/sdjcw/git-tutorial</a></h3>
</li>
<li>
<h3>产品技术部-通用产品团队</h3>
</li>
<li>
<h3>技术大学其他课程</h3>
<ul>
<li>Java入门</li>
<li>Java深入</li>
</ul>
</li>
</ul>
</section>
<section class="slide">
<h2>我们遇到的问题</h2>
<ul>
<li class="slide">
<h3>异地开发的痛苦</h3>
</li>
<li class="slide">
<h3>没有网络的情况下开发？</h3>
</li>
<li class="slide">
<h3>checkout过JBoss的源码吗？查看过log吗？</h3>
</li>
<li class="slide">
<h3>集权。。。</h3>
</li>
</ul>
</section>
<section class="slide">
<h2>痛苦的合并</h2>
<ul>
<li class="slide">
<h3>记录合并的版本号</h3>
</li>
<li class="slide">
<h3>向分支bugfix？大分支合并？多分支合并？</h3>
</li>
<li class="slide">
<h3>大量“非人为”的冲突</h3>
</li>
<li class="slide">
<h3>增量保存的缺陷</h3>
</li>
</ul>
</section>
<section class="slide">
<h2>到处都是.svn</h2>
<ul>
<li class="slide">
<h3>目录的复制和粘贴</h3>
</li>
</ul>
</section>
<section class="slide">
<h2>Git的特点</h2>
<ul>
<li class="slide">
<h3>分布式</h3>
</li>
<li class="slide">
<h3>全量保存</h3>
</li>
<li class="slide">
<h3>不同的分支设计</h3>
</li>
</ul>
</section>
<section class="slide">
<h2>Git的优势</h2>
<ul>
<li class="slide">
<h3>超轻量的分支</h3>
</li>
<li class="slide">
<h3>简单有效的合并</h3>
</li>
<li class="slide">
<h3>本地仓库</h3>
</li>
</ul>
</section>
<section class="slide">
<h2>Git的优势2</h2>
<ul>
<li class="slide">
<h3>快速</h3>
<ul>
<li>本地仓库</li>
<li>c语言编写，而且性能是设计目标</li>
</ul>
</li>
<li class="slide">
<h3>使用任何工作流</h3>
</li>
<li class="slide">
<h3>不污染子目录</h3>
<p>只有一份.git</p>
</li>
<li class="slide">
<h3>给力的命令行</h3>
</li>
</ul>
</section>
<section class="slide" id="git-help">
<h2>优秀的帮助系统</h2>
<ul>
<li class="slide">
<h3>恰到好处的命令提示</h3>
</li>
<li class="slide">
<h3>git help <command></h3>
<p>详尽的帮助文档</p>
</li>
</ul>
</section>
<section class="slide">
<h2>使用前的准备</h2>
<ol>
<li class="slide">
<h3>下载 & 安装</h3>
</li>
<li class="slide">
<h3>配置个人信息</h3>
<h4>$ git config --global user.name "shenfeng"</h4>
<h4>$ git config --global user.email "shenfeng@taobao.com"</h4>
</li>
</ol>
</section>
<section class="slide">
<h2>创建个人版本库</h2>
<ul>
<li class="slide">
<h3>git init</h3>
</li>
<li class="slide">
<h3>目录结构</h3>
<p></p>
</li>
</ul>
</section>
<section class="slide" id="dirs">
<h2>.git与工作目录</h2>
<ul>
<li class="slide">
<h3>.git</h3>
<ul>
<li>保存了git仓库的信息</li>
<li>只有一份</li>
</ul>
</li>
<li class="slide">
<h3>工作目录</h3>
<p>干活的目录</p>
</li>
</ul>
</section>
<section class="slide" id="simple-commit">
<h2>一次提交动作</h2>
<ul>
<li class="slide">
<h3>添加或修改文件</h3>
</li>
<li class="slide">
<h3>git status</h3>
<p>查看暂存区状态</p>
</li>
<li class="slide">
<h3>git add <file></h3>
<p>将变更添加到暂存区</p>
</li>
<li class="slide">
<h3>git commit</h3>
<p>提交变更</p>
</li>
</ul>
</section>
<section class="slide">
<h2>暂存区</h2>
<img src="imgs/stage.png" alt="暂存区" />
<ul>
<li class="slide">
<h3>能使你“变更的”和“需要提交的”分开</h3>
</li>
<li class="slide">
<h3>甚至支持一个文件只提交一部分</h3>
</li>
</ul>
</section>
<section class="slide">
<h2>文件状态</h2>
<img src="imgs/file-status-lifecycle.png" alt="文件状态" />
</section>
<section class="slide">
<h2>暂存区的操作</h2>
<ul>
<li class="slide">
<h3>git add <file></h3>
<ul>
<li>新增的文件(add the file)</li>
<li>修改的文件(stage the file)</li>
</ul>
</li>
<li class="slide">
<h3>git reset HEAD <file></h3>
<p>将变更从暂存区中移除(remove the file)</p>
<p>HEAD为版本库“最年轻”的版本</p>
</li>
<li class="slide">
<h3>git commit</h3>
<p>将暂存区内容提交</p>
</li>
</ul>
</section>
<section class="slide">
<h2>查看日志</h2>
<ul>
<li class="slide">
<h3>git log</h3>
</li>
<li class="slide">
<h3>git log --stat</h3>
<p>查看变更文件及行数</p>
</li>
</ul>
</section>
<section class="slide">
<h2>版本号</h2>
<ul>
<li class="slide">
<h3>指纹字串——SHA-1哈希值</h3>
<p>长度为40的十六进制字符串</p>
</li>
<li class="slide">
<h3>用来标识存储的对象</h3>
<p></p>
</li>
<li class="slide">
<h3>直接使用前5位即可</h3>
<p></p>
</li>
</ul>
</section>
<section class="slide">
<h2>git的对象模型</h2>
<ul>
<li class="slide">
<h3>Commit</h3>
<p>代表一次提交</p>
</li>
<li class="slide">
<h3>Tree</h3>
<p>代表一个目录</p>
</li>
<li class="slide">
<h3>Blob</h3>
<p>代表一个文件</p>
</li>
<li class="slide">
<h3>tag</h3>
<p>标记一个提交</p>
</li>
</ul>
</section>
<section class="slide">
<h2>Commit</h2>
<img src="imgs/commit.png" alt="Commit模型" />
<ul>
<li class="slide">
<h3>commit指向一个tree</h3>
<p>git show -s --pretty=raw <commitSHA1></p>
</li>
<li class="slide">
<h3>parent指向上一个commit</h3>
</li>
</ul>
</section>
<section class="slide">
<h2>Tree</h2>
<img src="imgs/tree.png" alt="Tree模型" />
<ul>
<li class="slide">
<h3>指向一组tree或blob</h3>
<p>git ls-tree <treeSHA1></p>
</li>
</ul>
</section>
<section class="slide">
<h2>Blob</h2>
<img src="imgs/blob.png" alt="Blob模型" />
<ul>
<li class="slide">
<h3>由文件内容计算出SHA1值</h3>
</li>
<li class="slide">
<h3>git show <blobSHA1></h3>
<p>直接查看文件内容</p>
</li>
<li class="slide">
<h3>不包含文件名</h3>
<p></p>
</li>
</ul>
</section>
<section class="slide">
<h2>一个完整的commit</h2>
<img src="imgs/dirtree.png" alt="一个完整的commit" />
<img src="imgs/modules.png" alt="一个完整的commit" />
</section>
<section class="slide">
<h2>Tag</h2>
<img src="imgs/tag.png" alt="Tag模型" />
</section>
<section class="slide" id="git-diff">
<h2>查看差异</h2>
<ul>
<li class="slide">
<h3>git diff</h3>
<p>查看工作目录与HEAD的差异</p>
</li>
<li class="slide">
<h3>git diff --staged</h3>
<p>查看暂存区与HEAD的差异</p>
<p>Git 1.6.1以前使用: git diff --cached</p>
</li>
</ul>
</section>
<section class="slide" id="ui-color">
<h2>启用色彩</h2>
<ul>
<li class="slide">
<h3>git config --global color.ui true</h3>
<p>打开全部配色</p>
</li>
</ul>
</section>
<section class="slide" id="reset">
<h2>撤销变更</h2>
<ul>
<li class="slide">
<h3>git checkout -- <file></h3>
<p>将工作目录的文件还原为HEAD</p>
</li>
<li class="slide">
<h3>git reset HEAD^</h3>
<p>将HEAD版本撤销，HEAD^为当前最新版本的上一个版本</p>
</li>
</ul>
</section>
<section class="slide" id="git-commit">
<h2>方便的commit</h2>
<ul>
<li class="slide">
<h3>git commit -m <msg></h3>
<p>直接添加注释信息并提交</p>
</li>
<li class="slide">
<h3>注释技巧</h3>
<ul>
<li>第一行少量概要文字——标题</li>
<li>第二行空行</li>
<li>第三行开始详细描述——正文</li>
</ul>
</li>
<li class="slide">
<h3>git commit -a</h3>
<p>自动将所有变更和删除的文件添加到索引并提交，但不包括新增文件</p>
</li>
</ul>
</section>
<section class="slide">
<h2>设置忽略选项</h2>
<ul>
<li class="slide">
<h3>添加.gitignore文件</h3>
<ul>
<li>*.class</li>
<li>target/</li>
</ul>
</li>
</ul>
</section>
<section class="slide" id="alias">
<h2>为指令添加别名</h2>
<ul>
<li class="slide">
<h3>git config alias.<alias> <command></h3>
<p>将<alias>作为命令<command>的别名</p>
</li>
<li class="slide">
<h3>或者直接修改.git/config文件</h3>
</li>
<li class="slide">
<h3>也可以添加--global参数使别名全局有效</h3>
<p>将修改~/.gitconfig文件</p>
</li>
<li class="slide">
<h3>ll = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative</h3>
<p>强大的log展现</p>
</li>
</ul>
</section>
<section class="slide">
<h2>一个功能（特性）开发的流程</h2>
<ul>
<li class="slide">
<h3>小步快走 vs 大步跳跃</h3>
</li>
<li class="slide">
<h3>我们一般使用后者，Why?</h3>
</li>
</ul>
</section>
<section class="slide">
<h2>SVN的障碍</h2>
<ul>
<li class="slide">
<h3>每一个提交均全局可见</h3>
</li>
<li class="slide">
<h3>分支合并的复杂度</h3>
<p></p>
</li>
</ul>
</section>
<section class="slide">
<h2>SVN的分支与合并</h2>
<ul>
<li class="slide">
<h3>更像是diff后打patch</h3>
<p>丢失了分支具体的变更记录</p>
</li>
<li class="slide">
<h3>要记录合并的版本</h3>
<p>1.5会自动使用文件夹属性来记录</p>
</li>
</ul>
</section>
<section class="slide">
<h2>使用git的开发的流程</h2>
<ul>
<li class="slide">
<h3>git branch</h3>
<p>查看分支</p>
</li>
<li class="slide">
<h3>git branch <branchName></h3>
<p>创建分支</p>
</li>
<li class="slide">
<h3>git checkout <branchName></h3>
<p>切换分支</p>
<ul>
<li>git checkout -b <branchName></li>
<p>创建并切换分支</p>
</ul>
</li>
</ul>
</section>
<section class="slide">
<h2>使用git的开发的流程2</h2>
<ul>
<li class="slide">
<h3>添加、修改文件</h3>
</li>
<li class="slide">
<h3>提交变更</h3>
</li>
<li class="slide">
<h3>切换到合并的目标分支</h3>
<p>如master分支</p>
<p>checkout时会回复工作目录</p>
</li>
<li class="slide">
<h3>git merge <branchName></h3>
<p>将<branchName>的所有变更合并到当前分支</p>
</li>
</ul>
</section>
<section class="slide" id="del-branch">
<h2>对分支的其他操作</h2>
<ul>
<li class="slide">
<h3>git branch --no-merged</h3>
<p>列出没有与当前分支合并的分支</p>
</li>
<li class="slide">
<h3>git diff ...<branchName></h3>
<p>当前分支与目标分支的交集与目标分支的差异</p>
</li>
</ul>
</section>
<section class="slide" id="del-branch">
<h2>删除分支</h2>
<ul>
<li class="slide">
<h3>git branch -d <branchName></h3>
<p>删除分支（如果需要）</p>
</li>
<li class="slide">
<h3>如果合并不完全则会删除失败</h3>
</li>
<li class="slide">
<h3>使用-D参数强制删除分支</h3>
<p>丢弃实验性分支时使用</p>
</li>
</ul>
</section>
<section class="slide">
<h2>如何实现？</h2>
<ul>
<li class="slide">
<h3>超轻量分支</h3>
</li>
<li class="slide">
<h3>简单有效的合并</h3>
</li>
</ul>
</section>
<section class="slide">
<h2>回顾commit模型</h2>
<img src="imgs/modules.png" alt="一个完整的commit" />
<ul>
<li class="slide">
<h3>parent指向上一个commit</h3>
</li>
</ul>
</section>
<section class="slide">
<h2>链式的commit</h2>
<img src="imgs/commits.png" alt="多个commit" />
</section>
<section class="slide">
<h2>Branch的本质</h2>
<img src="imgs/branch.png" alt="branch" />
<ul>
<li class="slide">
<h3>分支是指向commit的可变指针</h3>
</li>
</ul>
</section>
<section class="slide">
<h2>创建分支</h2>
<pre><code>$ git branch testing</code></pre>
<img src="imgs/add-test-branch.png" alt="创建test分支" />
<ul>
<li class="slide">
<h3>如何区别当前分支？</h3>
</li>
</ul>
</section>
<section class="slide">
<h2>HEAD</h2>
<img src="imgs/head.png" alt="head" />
</section>
<section class="slide">
<h2>切换分支</h2>
<pre><code>$ git checkout testing</code></pre>
<img src="imgs/checkout-branch.png" alt="切换分支" />
</section>
<section class="slide">
<h2>分支提交</h2>
<pre><code>$ vim test.rb
$ git commit -a -m 'made a change'</code></pre>
<img src="imgs/branch-commit.png" alt="分支提交" />
</section>
<section class="slide">
<h2>切换到master分支</h2>
<pre><code>$ git checkout master</code></pre>
<img src="imgs/checkout-master.png" alt="切换到master分支" />
</section>
<section class="slide">
<h2>master提交</h2>
<pre><code>$ vim test.rb
$ git commit -a -m 'made other changes'</code></pre>
<img src="imgs/master-commit.png" alt="master提交" />
</section>
<section class="slide">
<h2>超轻量分支</h2>
<ul>
<li class="slide">
<h3>一个分支仅仅是一个41字节的文件</h3>
<p>查看目录.git/refs/</p>
</li>
</ul>
</section>
<section class="slide">
<h2>分支的合并</h2>
<img src="imgs/pre-merge.png" alt="准备合并" />
</section>
<section class="slide" id="fast-forward">
<h2>fast-forward</h2>
<ul>
<li class="slide">
<h3>当一个分支的直接下游是另一个分支时，merge操作会产生fast-forward</h3>
</li>
<li class="slide">
<h3>--no-ff参数</h3>
<p>强制不使用fast-forward，比如需要保留分支的记录</p>
</li>
</ul>
</section>
<section class="slide">
<h2>合并hotfix</h2>
<img src="imgs/merge-hotfix.png" alt="合并hotfix" />
</section>
<section class="slide">
<h2>继续开发</h2>
<img src="imgs/commit-feature.png" alt="提交特性" />
</section>
<section class="slide">
<h2>合并issue</h2>
<pre><code>$ git checkout master
$ git merge iss53</code></pre>
<img src="imgs/merge-issue.png" alt="合并issue" />
</section>
<section class="slide">
<h2>合并完成</h2>
<img src="imgs/merge-finished.png" alt="合并完成" />
</section>
<section class="slide">
<h2>解决冲突</h2>
<ul>
<li class="slide">
<h3>冲突的产生</h3>
<p>两个合并的分支修改了同一处内容</p>
</li>
<li class="slide">
<h3>两个分支的维护者共同编辑冲突文件</h3>
<p>记得删除冲突标记</p>
</li>
<li class="slide">
<h3>将冲突文件添加索引并提交</h3>
</li>
</ul>
</section>
<section class="slide">
<h2>多用户协作</h2>
</section>
<section class="slide">
<h2>传输协议</h2>
<ul>
<li class="slide">
<h3>file</h3>
<ul>
<li>/path/to/repo.git/</li>
<li>file:///path/to/repo.git/</li>
</ul>
</li>
<li class="slide">
<h3>ssh</h3>
<p>ssh://[user@]host.xz[:port]/path/to/repo.git/</p>
</li>
<li class="slide">
<h3>http[s]</h3>
<p>http[s]://host.xz[:port]/path/to/repo.git/</p>
</li>
<li class="slide">
<h3>git</h3>
<p>git://host.xz[:port]/path/to/repo.git/</p>
</li>
</ul>
</section>
<section class="slide">
<h2>获取副本</h2>
<ul>
<li class="slide">
<h3>git clone <repo.git></h3>
<p>可以认为是创建了一个远程分支</p>
</li>
</ul>
</section>
<section class="slide">
<h2>多用户协作流程</h2>
<ul>
<li class="slide">
<h3>个人开发流程</h3>
<p>开分支、完成功能、合并等</p>
</li>
<li class="slide">
<h3>git pull <remote></h3>
<p>获取远端更新</p>
</li>
<li class="slide">
<h3>git push <remote></h3>
<p>将更新推送到远端，需要写权限</p>
</li>
</ul>
</section>
<section class="slide">
<h2>创建中心库</h2>
<ul>
<li class="slide">
<h3>git init --bare</h3>
<p>创建一个裸仓库，不包含工作目录</p>
</li>
<li class="slide">
<h3>也可以直接拷贝.git作为中心库</h3>
</li>
</ul>
</section>
<section class="slide">
<h2>有中心库的开发流程</h2>
<ul>
<li class="slide">
<h3>从中心库clone</h3>
</li>
<li class="slide">
<h3>个人开发流程</h3>
</li>
<li class="slide">
<h3>从中心库pull变更</h3>
</li>
<li class="slide">
<h3>push变更到中心库</h3>
</li>
</ul>
</section>
<section class="slide">
<h2>集中式工作流</h2>
<img src="imgs/workflow1.png" alt="集中式工作流" />
</section>
<section class="slide">
<h2>GitHub</h2>
<ul>
<li class="slide">
<h3><a href="https://github.com/">https://github.com/</a></h3>
</li>
<li class="slide">
<h3>不只是一个git仓库托管</h3>
<p></p>
</li>
</ul>
</section>
<section class="slide">
<h2>集成管理员工作流</h2>
<img src="imgs/workflow2.png" alt="集成管理员工作流" />
</section>
<section class="slide">
<h2>司令官与副官工作流</h2>
<img src="imgs/workflow3.png" alt="司令官与副官工作流" />
</section>
<section class="slide">
<h2>公司内部的GitLab</h2>
<ul>
<li class="slide">
<h3><a href="http://gitlab.taobao.ali.com/">http://gitlab.taobao.ali.com/</a></h3>
</li>
<li class="slide">
<h3>开账户找“徒维”</h3>
<p></p>
</li>
</ul>
</section>
<section class="slide" id="git-flow">
<h2>git flow</h2>
<ul>
<li class="slide">
<h3>A successful Git branching model</h3>
<p><a href="http://nvie.com/posts/a-successful-git-branching-model/">http://nvie.com/posts/a-successful-git-branching-model/</a></p>
</li>
</ul>
</section>
<section class="slide" id="git-flow">
<h2>作业</h2>
<ul>
<li class="slide">
<h3>git rebase</h3>
</li>
</ul>
</section>
<section class="slide">
<h1>Q & A</h1>
</section>
<section class="slide">
<h1>希望给你带来了帮助
Bye~</h1>
</section>
<!--
<section class="slide">
<h2></h2>
<ul>
<li class="slide">
<h3></h3>
<p></p>
</li>
<li class="slide">
<h3></h3>
<p></p>
</li>
<li class="slide">
<h3></h3>
<p></p>
</li>
</ul>
</section>
-->
<a href="#" class="deck-prev-link" title="Previous">←</a>
<a href="#" class="deck-next-link" title="Next">→</a>
<p class="deck-status">
<span class="deck-status-current"></span>
/
<span class="deck-status-total"></span>
</p>
<form action="." method="get" class="goto-form">
<label for="goto-slide">Go to slide:</label>
<input type="text" name="slidenum" id="goto-slide" list="goto-datalist">
<datalist id="goto-datalist"></datalist>
<input type="submit" value="Go">
</form>
<a href="." title="Permalink to this slide" class="deck-permalink">#</a>
<!-- Grab CDN jQuery, with a protocol relative URL; fall back to local if offline -->
<script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.7.min.js"></script>
<script>window.jQuery || document.write('<script src="deck.js/jquery-1.7.min.js"><\/script>')</script>
<!-- Deck Core and extensions -->
<script src="deck.js/core/deck.core.js"></script>
<script src="deck.js/extensions/hash/deck.hash.js"></script>
<script src="deck.js/extensions/menu/deck.menu.js"></script>
<script src="deck.js/extensions/goto/deck.goto.js"></script>
<script src="deck.js/extensions/status/deck.status.js"></script>
<script src="deck.js/extensions/navigation/deck.navigation.js"></script>
<!-- Specific to this page -->
<script src="index.js"></script>
</body>
</html>