Git Techtalk

A dutch presentation about Git with all the basics, a good intro in how it actually works and how it is different than for example SVN and with a lot of free hidden tips to make the use of Git even more fun and handy!

Transcript

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