SLIDE 1 Links
- this: //nasinf001/abajric/git-doc.git
- Demo: //nasinf001/abajric/git-demo.git
- Pro Git: http://git-scm.com/book/
- Branching Model:
http://nvie.com/posts/a-successful-git-branching-mod el/
- Tutorial: https://www.atlassian.com/git/tutorial
SLIDE 2 Vorteile gegenüber SVN
- Verteilt
- Schnell
- Branch/merge einfacher
- Non-linear History
- workflow
- simple
SLIDE 3 Nachteile gegenüber SVN
- komplexer
- Repositories sind grösser (nicht immer z.B. Mozilla)
- Kein Checkout von Unterordnern
- Kein Access Control
- Schlechterer GUI support
- Binäre Dateien (Grösse, history split)
SLIDE 4
basics - distributed
centralized distributed
SLIDE 5 basics
- Snapshots, Not Differences
- Hash
- fast alles wird local ausgeführt
- Daten werden nur hinzugefügt (GC 30 Tage)
- Username / E-Mail
SLIDE 6
basics - database
SVN git
SLIDE 7
basics - stagin
SLIDE 8
basics – status lifecycle
SLIDE 9
basics - commits
.git README LICENSE test.rb
SLIDE 10
basics - commits
SLIDE 11
branches – pointer
SLIDE 12 branches - new
git branch testing
SLIDE 13
branches - new
SLIDE 14 branches - checkout
git checkout testing
SLIDE 15
branches - divergence
SLIDE 16 branches - divergence
git checkout master
SLIDE 17
branches - divergence
SLIDE 18
branches - why
SLIDE 19
branches - why
SLIDE 20
branches - why
SLIDE 21
branches - why
SLIDE 22
branches - why
SLIDE 23
branches – long-running
SLIDE 24
branches - topic
SLIDE 25
remotes - clone
SLIDE 26
remotes - divergence
SLIDE 27
remotes - fetch
SLIDE 28
remotes - divergence
SLIDE 29
remotes - fetch
SLIDE 30
rebase – no-ff merge
SLIDE 31
rebase - linearization
SLIDE 32
rebase - example
SLIDE 33
rebase - example
SLIDE 34
rebase - example
SLIDE 35
rebase - example
SLIDE 36 rebase – rewrite history
initial commit readme file added bug fixed new feature A added new feature B added fixup feature A master develop initial commit readme file added bug fixed new feature A added fixup feature A new feature B added master develop
SLIDE 37 rebase – rewrite history
initial commit readme file added bug fixed new feature A added fixup feature A new feature B added master develop initial commit readme file added bug fixed new feature A added new feature B added new feature C added master develop
SLIDE 38
workflow - centralized
SLIDE 39
workflow – integration manager
SLIDE 40
workflow – dictator / lieutenants
SLIDE 41
gitflow – main branches
SLIDE 42
gitflow – support branches
SLIDE 43
gitflow – fast forward
SLIDE 44
gitflow – release
SLIDE 45
gitflow – hotfix
SLIDE 46
gitflow – hotfix
