×
Copy
Open
Link
Embed
Share
Beginning
This slide
Copy link URL
Copy link URL
Copy iframe embed code
Copy iframe embed code
Copy javascript embed code
Copy javascript embed code
Share
Tweet
Share
Tweet
Slide 1
Slide 1 text
Versiecontrole met Git Openminds TechTalk 14 september 2011 @openminds Tuesday 27 September 2011
Slide 2
Slide 2 text
Wat •Versiecontrole •Team-tool •Offline Tuesday 27 September 2011
Slide 3
Slide 3 text
git basis gebruik demo gitimmersion - lab 3 tot lab 10 Tuesday 27 September 2011
Slide 4
Slide 4 text
git: drie statussen •“unstaged” aanpassingen •“staged” aanpassingen •“committed” aanpassingen Tuesday 27 September 2011
Slide 5
Slide 5 text
Git: het geheim •Git slaat wijzigingen op •Het is geen snapshot van de files •Het is een verzameling/opeenvolging van diffs Tuesday 27 September 2011
Slide 6
Slide 6 text
diffs, geen snapshots Tuesday 27 September 2011
Slide 7
Slide 7 text
diffs, geen snapshots Tuesday 27 September 2011
Slide 8
Slide 8 text
diffs, geen snapshots Tuesday 27 September 2011
Slide 9
Slide 9 text
Een diff tussen 1 en 2 diffs, geen snapshots Tuesday 27 September 2011
Slide 10
Slide 10 text
Een diff tussen 1 en 2 diffs, geen snapshots Tuesday 27 September 2011
Slide 11
Slide 11 text
Een diff tussen 1 en 2 diffs, geen snapshots Tuesday 27 September 2011
Slide 12
Slide 12 text
diff Tuesday 27 September 2011
Slide 13
Slide 13 text
git log Tuesday 27 September 2011
Slide 14
Slide 14 text
sha 88a7a694e6e4e91263bab2980b23d9d4aaceef89 2ec50a5390f93ee7a52e5ba9edcdaa28e9d5dc4c Tuesday 27 September 2011
Slide 15
Slide 15 text
Remotes Tuesday 27 September 2011
Slide 16
Slide 16 text
Remotes Joren Server (origin) git remote add origin
[email protected]
:hello.git Tuesday 27 September 2011
Slide 17
Slide 17 text
git push origin master Joren Server Tuesday 27 September 2011
Slide 18
Slide 18 text
git push origin master Joren origin Tuesday 27 September 2011
Slide 19
Slide 19 text
git push github master Joren github git remote add github
[email protected]
:hello.git Tuesday 27 September 2011
Slide 20
Slide 20 text
git pull origin master Joren origin Tuesday 27 September 2011
Slide 21
Slide 21 text
git pull origin master Joren origin Tuesday 27 September 2011
Slide 22
Slide 22 text
git clone Bram origin Tuesday 27 September 2011
Slide 23
Slide 23 text
git clone
[email protected]
:hello.git Bram origin Tuesday 27 September 2011
Slide 24
Slide 24 text
Master •hoofd-lijn Tuesday 27 September 2011
Slide 25
Slide 25 text
HEAD •“vertrekpunt voor de volgende diff” •uw plaats in de boom •‘daar waar ge op aan het werken zijt’ •een bol Tuesday 27 September 2011
Slide 26
Slide 26 text
HEAD - master HEAD master-branch Tuesday 27 September 2011
Slide 27
Slide 27 text
git checkout 567hj87 HEAD master-branch Tuesday 27 September 2011
Slide 28
Slide 28 text
git checkout master HEAD master-branch Tuesday 27 September 2011
Slide 29
Slide 29 text
Tuesday 27 September 2011
Slide 30
Slide 30 text
Tags v1 v1.1 Tuesday 27 September 2011
Slide 31
Slide 31 text
Branches Tuesday 27 September 2011
Slide 32
Slide 32 text
Branches Tuesday 27 September 2011
Slide 33
Slide 33 text
Branches Tuesday 27 September 2011
Slide 34
Slide 34 text
Branches Tuesday 27 September 2011
Slide 35
Slide 35 text
Branches Tuesday 27 September 2011
Slide 36
Slide 36 text
Branches master feature2 feature1 Tuesday 27 September 2011
Slide 37
Slide 37 text
Branches demo git immersion lab 24-28 Tuesday 27 September 2011
Slide 38
Slide 38 text
Branches master feature2 feature1 Tuesday 27 September 2011
Slide 39
Slide 39 text
git checkout master HEAD Tuesday 27 September 2011
Slide 40
Slide 40 text
git checkout feature2 HEAD Tuesday 27 September 2011
Slide 41
Slide 41 text
git checkout gh6789j HEAD Tuesday 27 September 2011
Slide 42
Slide 42 text
Merge Tuesday 27 September 2011
Slide 43
Slide 43 text
Merge Tuesday 27 September 2011
Slide 44
Slide 44 text
git merge feature1 Tuesday 27 September 2011
Slide 45
Slide 45 text
git merge feature1 merged feature1 into master Tuesday 27 September 2011
Slide 46
Slide 46 text
git merge feature1 merged feature1 into master Tuesday 27 September 2011
Slide 47
Slide 47 text
Conflicten master-branch Tuesday 27 September 2011
Slide 48
Slide 48 text
Conflicten master-branch Tuesday 27 September 2011
Slide 49
Slide 49 text
Conflicten feature2-branch master-branch Tuesday 27 September 2011
Slide 50
Slide 50 text
Conflicten Tuesday 27 September 2011
Slide 51
Slide 51 text
Conflicten git merge feature2 Tuesday 27 September 2011
Slide 52
Slide 52 text
Conflicten Tuesday 27 September 2011
Slide 53
Slide 53 text
Rebase a b c d e f g Tuesday 27 September 2011
Slide 54
Slide 54 text
a b c d e f g e git rebase feature1 Tuesday 27 September 2011
Slide 55
Slide 55 text
a b c d e f g e git rebase feature1 Tuesday 27 September 2011
Slide 56
Slide 56 text
a b c d e f g e f git rebase feature1 Tuesday 27 September 2011
Slide 57
Slide 57 text
a b c d e f g e f git rebase feature1 Tuesday 27 September 2011
Slide 58
Slide 58 text
a b c d e f g e f g git rebase feature1 Tuesday 27 September 2011
Slide 59
Slide 59 text
a b c d e f g e f g git rebase feature1 Tuesday 27 September 2011
Slide 60
Slide 60 text
git rebase master a b c d e f g Tuesday 27 September 2011
Slide 61
Slide 61 text
git rebase master a b c d e Tuesday 27 September 2011
Slide 62
Slide 62 text
git rebase master a b c d e Tuesday 27 September 2011
Slide 63
Slide 63 text
git rebase master a b c d e f Tuesday 27 September 2011
Slide 64
Slide 64 text
git rebase master a b c d e f Tuesday 27 September 2011
Slide 65
Slide 65 text
git rebase master a b c d e f g Tuesday 27 September 2011
Slide 66
Slide 66 text
git rebase master a b c d e f g Tuesday 27 September 2011
Slide 67
Slide 67 text
Conflicten Tuesday 27 September 2011
Slide 68
Slide 68 text
Remotes Tuesday 27 September 2011
Slide 69
Slide 69 text
Remotes joren Server bram HEAD Tuesday 27 September 2011
Slide 70
Slide 70 text
Remotes joren Server bram fetch HEAD Tuesday 27 September 2011
Slide 71
Slide 71 text
Pull •eerst een fetch •dan rebase of merge Tuesday 27 September 2011
Slide 72
Slide 72 text
Pull - rebase of merge •kies maar •rebase legt het probleem bij jouw changes •merge moet je anderen hun changes aanpassen Tuesday 27 September 2011
Slide 73
Slide 73 text
Dagelijks gebruik Tuesday 27 September 2011
Slide 74
Slide 74 text
Normale werkdag •git pull • •git push Tuesday 27 September 2011
Slide 75
Slide 75 text
Normaal •(maak veranderingen - programmeer) •git add •git commit •git rm •git mv ... Tuesday 27 September 2011
Slide 76
Slide 76 text
Doh! •van stage naar unstage: git reset HEAD filename •van commit naar niet-commit: git revert Tuesday 27 September 2011
Slide 77
Slide 77 text
Doh! •unstaged wijzigingen weggooien git checkout filename •enkele commits weggooien git reset --hard sha123 Tuesday 27 September 2011
Slide 78
Slide 78 text
Extra’s Tuesday 27 September 2011
Slide 79
Slide 79 text
cherry-picking Tuesday 27 September 2011
Slide 80
Slide 80 text
cherry-picking Tuesday 27 September 2011
Slide 81
Slide 81 text
aliases configureren git immersion lab 11 Tuesday 27 September 2011
Slide 82
Slide 82 text
.gitignore Tuesday 27 September 2011
Slide 83
Slide 83 text
submodules Tuesday 27 September 2011
Slide 84
Slide 84 text
bare / github / gitorious Tuesday 27 September 2011
Slide 85
Slide 85 text
git commit --amend Tuesday 27 September 2011
Slide 86
Slide 86 text
git bisect Tuesday 27 September 2011
Slide 87
Slide 87 text
boomstructuur en gc Tuesday 27 September 2011
Slide 88
Slide 88 text
git hooks Tuesday 27 September 2011
Slide 89
Slide 89 text
git send-email 5674h84hjks834 Tuesday 27 September 2011
Slide 90
Slide 90 text
git stash git stash pop Tuesday 27 September 2011
Slide 91
Slide 91 text
git add -i Tuesday 27 September 2011
Slide 92
Slide 92 text
git add -p hello.rb Tuesday 27 September 2011
Slide 93
Slide 93 text
git checkout branch --track remote/branch Tuesday 27 September 2011
Slide 94
Slide 94 text
GIT Immersion http://www.gitimmersion.com Tuesday 27 September 2011
Slide 95
Slide 95 text
Pro Git http://progit.org/book/ Tuesday 27 September 2011
Slide 96
Slide 96 text
Git Cheat Sheet http://www.cheat-sheets.org/saved-copy/git-cheat-sheet-large.png Tuesday 27 September 2011
Slide 97
Slide 97 text
Bedankt! www.openminds.be - @openminds Managed hosting services Presentatie door @joren en @wonko_be Tuesday 27 September 2011