Git

Slides from a Git introduction lecture at ENSAE for second-year students. Slides are in French but there isn’t much text.

Note this is here for archive only. I don’t think anymore that this is the right way to teach Git.

Transcript

1. Git 14/11/2016 – ENSAE Baptiste Fontaine
2. Collaboration
3. Collaboration
4. Linux 2.6.12 – Juin 2005
5. Linux 2.6.12 – Juin 2005 400 contributeurs
6. Linux 2.6.12 – Juin 2005 400 contributeurs 1,5k lignes de code ajoutées chaque jour
7. Principes
8. 1.
9. 1. Vitesse
10. 2. Asynchronicité
11. 2. nicité Asynchr
12. 2. nicité Asynchr
13. 2. nicité Asynchr
14. 3.
15. 3. Sécurité
16. Concepts
17. Repository
18. Repository Répertoire suivi par git =
19. monProjet/
20. monProjet/ .git/ main.cpp README.md
21. monProjet/ .git/ main.cpp README.md
22. monProjet/ .git/ main.cpp README.md
24. Commit
25. Commit = Snapshot du Repository
26. Patch
27. Patch = Description d’un Changement
29. Branche
30. Branche cui
31. Branche
32. Branche
33. Branche
34. Branche
35. Branche
36. Branche
37. Branche
38. Branche
39. Branche
40. Branche
41. Branche master
43. Remote
44. Remote
45. Remote
46. Remote GitHub
47. Remote GitHub GitLab Codebase Bitbucket Perforce Assembla Beanstalk
48. Remote GitHub & co
49. Remote GitHub & co pull
50. Remote push GitHub & co pull
52. Recap
53. Recap Repository ≈Projet
54. Recap Repository Commit
55. Recap Repository Commit Branche
56. Recap Repository Commit Branche Remote
58. Git en Pratique
59. git init
60. > git init
61. > git init Initialized empty Git repository in /…/monProjet/.git/
62. git status
63. > git init Initialized empty Git repository in /…/monProjet/.git/ > git status
64. > git init Initialized empty Git repository in /…/monProjet/.git/ > git status On branch master Initial commit nothing to commit (create/copy files and use "git add" to track)
65. > git init Initialized empty Git repository in /…/monProjet/.git/ > git status On branch master Initial commit nothing to commit (create/copy files and use "git add" to track)
66. git help
67. > git help <command>
68. > git help <command> > git help add > git help status > git help init > git help log
69. Changer les choses des trucs
71. Projet C++ (allégorie)
72. > git status
73. > git status On branch master Initial commit Untracked files: (use "git add <file>..." to include in what will be committed) README.txt main.cpp nothing added to commit but untracked files present (use "git add" to track)
74. > git status On branch master Initial commit Untracked files: (use "git add <file>..." to include in what will be committed) README.txt main.cpp nothing added to commit but untracked files present (use "git add" to track) {
75. > git status --short ?? README.txt ?? main.cpp
76. > git status --short ?? README.txt ?? main.cpp > git add main.cpp
77. > git status --short A main.cpp ?? README.txt > git status --short ?? README.txt ?? main.cpp > git add main.cpp
78. > git status --short A main.cpp A README.txt > git status --short ?? README.txt ?? main.cpp > git add .
79. > git status --short A main.cpp A README.txt > git status --short ?? README.txt ?? main.cpp > git add *
80. > git add . > git status --short A main.cpp A README.txt
81. > git status --short A main.cpp A README.txt > git add . > git reset main.cpp > git status --short ?? main.cpp A README.txt
82. Unstaged Staged README.txt main.cpp
83. Unstaged Staged README.txt main.cpp git add <file>
84. Unstaged Staged README.txt main.cpp git add <file> git reset <file>
85. > git status --short A main.cpp A README.txt
86. > git status --short A main.cpp A README.txt > git commit -m \ "initial commit"
87. > git status --short A main.cpp A README.txt > git commit -m \ "initial commit" [master (root-commit) dc3bcbe] initial commit 2 files changed, 11 insertions(+) create mode 100644 README.txt create mode 100644 main.cpp
88. > git status --short
89. > git status --short (rien)
90. > git status --short > git status On branch master nothing to commit, working tree clean (rien)
91. > git log
92. > git log commit dc3bcbe86f22be1029d70f3e0642c23084173b7e Author: Baptiste Fontaine <b@ptistefontaine.fr> Date: Sun Nov 13 13:46:38 2016 +0100 initial commit
93. Déplacer & Supprimer
94. git mv <file1> <file2> Déplacer & Supprimer git rm <file>
95. > git mv main.cpp a.cpp
96. > git mv main.cpp a.cpp > git status --short R main.cpp -> a.cpp
97. > git mv main.cpp a.cpp > git status --short R main.cpp -> a.cpp > git commit -m "move stuff" [master 50b4a18] move stuff 1 file changed, 0 insertions(+), 0 deletions(-) rename main.cpp => a.cpp (100%)
98. > git rm a.cpp
99. > git rm a.cpp rm 'a.cpp'
100. > git rm a.cpp rm 'a.cpp' > git status --short D a.cpp
101. > git rm a.cpp rm 'a.cpp' > git status --short D a.cpp > git commit -m "remove stuff" [master bf366d7] remove stuff 1 file changed, 7 deletions(-) delete mode 100644 a.cpp
103. Recap
104. Recap git init
105. Recap git init git status (--short)
106. Recap git init git status (--short) git add <file>
107. Recap git init git status (--short) git add <file> git commit -m "………"
108. Recap git init git status (--short) git add <file> git commit -m "………"
109. Recap git init git status (--short) git add <file> git commit -m "………" git reset -- <file>
110. Recap git init git status (--short) git add <file> git commit -m "………" git mv <file1> <file2> git rm <file> git reset -- <file>
112. Historique
113. log
114. git log
115. > git log
116. commit bf366d79d16245ce9d851465ee5fcb2847ad82fb Author: Baptiste Fontaine <b@ptistefontaine.fr> Date: Sun Nov 13 13:46:17 2016 +0100 remove stuff commit 50b4a18b336f154d04b37f07fc7b9f529a124fcc Author: Baptiste Fontaine <b@ptistefontaine.fr> Date: Sun Nov 13 13:41:22 2016 +0100 move stuff commit dc3bcbe86f22be1029d70f3e0642c23084173b7e Author: Baptiste Fontaine <b@ptistefontaine.fr> Date: Sun Nov 13 13:16:38 2016 +0100 initial commit > git log
117. commit bf366d79d16245ce9d851465ee5fcb2847ad82fb Author: Baptiste Fontaine <b@ptistefontaine.fr> Date: Sun Nov 13 13:46:17 2016 +0100 remove stuff delete mode 100644 a.cpp commit 50b4a18b336f154d04b37f07fc7b9f529a124fcc Author: Baptiste Fontaine <b@ptistefontaine.fr> Date: Sun Nov 13 13:41:22 2016 +0100 move stuff rename main.cpp => a.cpp (100%) commit dc3bcbe86f22be1029d70f3e0642c23084173b7e Author: Baptiste Fontaine <b@ptistefontaine.fr> Date: Sun Nov 13 13:16:38 2016 +0100 initial commit create mode 100644 README.txt create mode 100644 main.cpp > git log --summary
118. commit bf366d79d16245ce9d851465ee5fcb2847ad82fb Author: Baptiste Fontaine <b@ptistefontaine.fr> Date: Sun Nov 13 13:46:17 2016 +0100 remove stuff delete mode 100644 a.cpp commit 50b4a18b336f154d04b37f07fc7b9f529a124fcc Author: Baptiste Fontaine <b@ptistefontaine.fr> Date: Sun Nov 13 13:41:22 2016 +0100 move stuff rename main.cpp => a.cpp (100%) commit dc3bcbe86f22be1029d70f3e0642c23084173b7e Author: Baptiste Fontaine <b@ptistefontaine.fr> Date: Sun Nov 13 13:16:38 2016 +0100 initial commit create mode 100644 README.txt create mode 100644 main.cpp > git log --summary
119. bf366d7 remove stuff 50b4a18 move stuff dc3bcbe initial commit > git log --oneline
120. bf366d7 remove stuff delete mode 100644 a.cpp 50b4a18 move stuff rename main.cpp => a.cpp (100%) dc3bcbe initial commit create mode 100644 README.txt create mode 100644 main.cpp > git log --oneline --summary
121. > vim hello.cpp > git add . > git commit -m "Add hello.cpp" [master f8f6ceb] Add hello.cpp 1 file changed, 7 insertions(+) create mode 100644 hello.cpp > vim Makefile > git commit -m "Add Makefile" [master 622f151] Add Makefile 1 file changed, 2 insertions(+) create mode 100644 Makefile > vim Makefile > git add . > git commit -m "Makefile: Add 'clean' target" [master e0b1888] Makefile: Add 'clean' target 1 file changed, 6 insertions(+), 1 deletion(-) > vim README.txt > git add . > git commit -m "README: Add compilation instructions" [master 1365375] README: Add compilation instructions 1 file changed, 5 insertions(+)
122. > git log --oneline --summary 1365375 README: Add compilation instructions e0b1888 Makefile: Add 'clean' target 622f151 Add Makefile create mode 100644 Makefile f8f6ceb Add hello.cpp create mode 100644 hello.cpp bf366d7 remove stuff delete mode 100644 a.cpp 50b4a18 move stuff rename main.cpp => a.cpp (100%) dc3bcbe initial commit create mode 100644 README.txt create mode 100644 main.cpp
123. > git log --oneline --summary 1365375 README: Add compilation instructions e0b1888 Makefile: Add 'clean' target 622f151 Add Makefile create mode 100644 Makefile f8f6ceb Add hello.cpp create mode 100644 hello.cpp bf366d7 remove stuff delete mode 100644 a.cpp 50b4a18 move stuff rename main.cpp => a.cpp (100%) dc3bcbe initial commit create mode 100644 README.txt create mode 100644 main.cpp
124. e0b1888 Makefile: Add 'clean' target
125. > git show e0b1888^:Makefile hello: hello.cpp g++ $< -o $@
126. > git show e0b1888 commit e0b188879ba1a5aab3c0a732d5188a84a338850a Author: Baptiste Fontaine <b@ptistefontaine.fr> Date: Sun Nov 13 19:43:57 2016 +0100 Makefile: Add 'clean' target diff --git a/Makefile b/Makefile index 74759f0..3da0c15 100644 --- a/Makefile +++ b/Makefile @@ -1,2 +1,7 @@ -hello: hello.cpp +TARGET=hello + +$(TARGET): hello.cpp }
127. > git show --oneline e0b1888 e0b1888 Makefile: Add 'clean' target diff --git a/Makefile b/Makefile index 74759f0..3da0c15 100644 --- a/Makefile +++ b/Makefile @@ -1,2 +1,7 @@ -hello: hello.cpp +TARGET=hello + +$(TARGET): hello.cpp g++ $< -o $@ + +clean: + rm -f $(TARGET)
128. diff
129. diff status
130. differences
131. > vim README.txt > git status --short
132. > vim README.txt > git status --short M README.txt
133. > git diff
134. > git diff diff --git a/README.txt b/README.txt index 78c5cf8..033103a 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ MyProject ========= -This is my project. +This is my awesome project. Compile -------
135. > git diff --word-diff diff --git a/README.txt b/README.txt index 78c5cf8..033103a 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ MyProject ========= This is my {+awesome+} project. Compile -------
136. > git add . > git diff (rien)
137. > git add . > git diff --staged diff --git a/README.txt b/README.txt index 78c5cf8..033103a 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ MyProject ========= -This is my project. +This is my awesome project. Compile -------
139. Recap
140. Recap git log
141. Recap git log git show
142. Recap git log git show git diff
143. Remotes
144. clone
145. git clone
146. > git clone <url>
147. > git clone https://github.com/bfontaine/example.git
148. > git clone https://github.com/bfontaine/example.git Cloning into 'example'... remote: Counting objects: 19, done. remote: Compressing objects: 100% (16/16), done. remote: Total 19 (delta 0), reused 19 (delta 0), pack-reused 0 Unpacking objects: 100% (19/19), done.
149. > git clone https://github.com/bfontaine/example.git Cloning into 'example'... remote: Counting objects: 19, done. remote: Compressing objects: 100% (16/16), done. remote: Total 19 (delta 0), reused 19 (delta 0), pack-reused 0 Unpacking objects: 100% (19/19), done. > ls example/ Makefile README.txt hello.cpp
150. Remote push GitHub & co pull (le retour)
151. Remote git push GitHub & co git pull (le retour)
152. git push git pull
153. git push <url> <branche> git pull <url> <branche>
154. git remote
155. git remote add <nom> <url>
156. > git remote add \ origin git@github.com:bfontaine/example.git
157. > git remote add \ > git remote origin origin git@github.com:bfontaine/example.git
158. > git remote add \ > git remote origin origin git@github.com:bfontaine/example.git > git remote -v origin git@github.com:bfontaine/example.git (fetch) origin git@github.com:bfontaine/example.git (push)
159. > git {push pull }git@github.com:bfontaine/example.git master
160. > git {push pull } origin master
161. > git {push pull }origin master
162. > git {push pull }origin master > git push -u origin master
163. > git {push pull }origin master > git push -u origin master Branch master set up to track remote branch master from origin.
164. > git {push pull }origin master > git push -u origin master Branch master set up to track remote branch master from origin. > git push > git pull
166. Recap
167. Recap git clone
168. Recap git clone git pull
169. Recap git clone git pull git push
170. Recap git clone git pull git remote git push
172. Branches
173. git branch
174. > git branch * master
175. > git branch * master > git branch <nom>
176. > git branch * master > git branch doc
177. > git branch * master > git branch doc > git branch * master doc
178. > git branch * master > git branch doc > git branch * master > git checkout doc Switched to branch 'doc' doc
179. > git branch * master > git branch doc > git branch * master doc > git checkout doc Switched to branch 'doc' > git branch master * doc
180. > git checkout -b doc > git branch * master Switched to a new branch 'doc' > git branch master * doc
181. > git diff diff --git a/hello.cpp b/hello.cpp index 205ec4e..5aaf27d 100644 --- a/hello.cpp +++ b/hello.cpp @@ -1,5 +1,6 @@ #include <iostream> +// This function is so useful int main() { std::cout << "Hello, World!" << std::endl;
182. > git add . > git commit -m "Add docs" [doc 4322962] Add docs 1 file changed, 1 insertion(+)
183. > git add . > git commit -m "Add docs" [doc 4322962] Add docs 1 file changed, 1 insertion(+)
184. > git add . > git commit -m "Add docs" [doc 4322962] Add docs 1 file changed, 1 insertion(+) … master doc
185. > git checkout master Switched to branch 'master'
186. > git checkout master Switched to branch 'master' > vim hello.cpp > git diff diff --git a/hello.cpp b/hello.cpp index 205ec4e..0c03ed4 100644 --- a/hello.cpp +++ b/hello.cpp @@ -2,6 +2,6 @@ int main() { - std::cout << "Hello, World!" << std::endl; + std::cout << "Hello World!" << std::endl; return 0; }
187. > git add . > git commit -m "No comma plz" [master 8b13a27] No comma plz 1 file changed, 1 insertion(+), 1 deletion(-)
188. > git add . > git commit -m "No comma plz" [master 8b13a27] No comma plz 1 file changed, 1 insertion(+), 1 deletion(-) … master doc
189. … master doc
190. … master ? doc
191. … master Fusionner deux branches ! doc
192. … master Merge ! doc
193. … master > git merge <branche> ! doc
194. … master > git merge doc doc
195. … > git merge doc doc master
196. > git merge doc Auto-merging hello.cpp Merge made by the 'recursive' strategy. hello.cpp | 1 + 1 file changed, 1 insertion(+) … doc master
197. > git branch -d doc Deleted branch doc (was 4322962). … master
198. Résoudre les conflits
199. > git checkout -b yolo > vim README.txt > git add . > git diff --staged diff --git a/README.txt b/README.txt index 033103a..d2b6d6d 100644 --- a/README.txt +++ b/README.txt @@ -1,9 +1,11 @@ MyProject ========= -This is my awesome project. +This is my awful project. Compile ------- make + +Run with ./hello.
200. > git checkout -b yolo > vim README.txt > git add . > git commit -m "Better README" > git checkout master
201. > git checkout -b yolo > vim README.txt > git add . > git commit -m "Better README" > git checkout master
202. > git checkout -b yolo > vim README.txt > git add . > git commit -m "Better README" > git checkout master diff --git a/README.txt b/README.txt index 033103a..8187df5 100644 --- a/README.txt +++ b/README.txt @@ -1,9 +1,10 @@ MyProject ========= -This is my awesome project. +This is my super awesome project. Compile ------- + make clean make > vim README.txt > git diff
203. > git checkout -b yolo > vim README.txt > git add . > git commit -m "Better README" > git checkout master > vim README.txt > git diff > git add . > git commit -m "Improved README"
204. > git checkout -b yolo > vim README.txt > git add . > git commit -m "Better README" > git checkout master > vim README.txt > git diff > git add . > git commit -m "Improved README" … master yolo
205. diff --git a/README.txt b/README.txt index 033103a..8187df5 100644 --- a/README.txt +++ b/README.txt @@ -1,9 +1,10 @@ MyProject ========= -This is my awesome project. +This is my super awesome project. Compile ------- + make clean make > git show master > git show yolo diff --git a/README.txt b/README.txt index 033103a..d2b6d6d 100644 --- a/README.txt +++ b/README.txt @@ -1,9 +1,11 @@ MyProject ========= -This is my awesome project. +This is my awful project. Compile ------- make + +Run with ./hello.
206. … master yolo > git merge yolo
207. … master yolo > git merge yolo
208. … master yolo > git merge yolo Auto-merging README.txt CONFLICT (content): Merge conflict in README.txt Recorded preimage for 'README.txt' Automatic merge failed; fix conflicts and then commit the result.
209. > cat README.txt MyProject ========= <<<<<<< HEAD This is my super awesome project. ======= This is my awful project. >>>>>>> yolo Compile ------- make clean make Run with ./hello.
210. > cat README.txt MyProject ========= <<<<<<< HEAD This is my super awesome project. ======= This is my awful project. >>>>>>> yolo Compile ------- make clean make Run with ./hello. conflit }
211. > cat README.txt MyProject ========= Compile ------- make clean make Run with ./hello. conflit } This is my super awesome project. (résolu)
212. > cat README.txt > git add . > git commit -m "merge 'yolo'"
213. > cat README.txt > git add . > git commit -m "merge 'yolo'" Recorded preimage for 'README.txt' [master f4d0975] merge 'yolo'
214. > cat README.txt > git add . > git commit -m "merge 'yolo'" Recorded preimage for 'README.txt' [master f4d0975] merge 'yolo' > git branch -d yolo Deleted branch yolo (was 6e00883).
215. > git log --oneline --graph * f4d0975 merge 'yolo' |\ | * 6e00883 Better README * | a710abb Improved README |/ * 617dce9 Merge branch 'doc' |\ | * 4322962 Add docs * | 8b13a27 No comma plz |/ * dcbfea1 Better README * 1365375 README: Add compilation instructions * e0b1888 Makefile: Add 'clean' target * 622f151 Add Makefile * f8f6ceb Add hello.cpp * bf366d7 remove stuff * 50b4a18 move stuff * dc3bcbe initial commit
216. > git log --oneline --graph * f4d0975 merge 'yolo' |\ | * 6e00883 Better README * | a710abb Improved README |/ * 617dce9 Merge branch 'doc' |\ | * 4322962 Add docs * | 8b13a27 No comma plz |/ * dcbfea1 Better README * 1365375 README: Add compilation instructions * e0b1888 Makefile: Add 'clean' target * 622f151 Add Makefile * f8f6ceb Add hello.cpp * bf366d7 remove stuff * 50b4a18 move stuff * dc3bcbe initial commit
218. Recap
219. Recap git branch (<nom>) git checkout (-b) <nom>
220. Recap git branch (<nom>) git checkout (-b) <nom> git merge <nom> git branch -d <nom>
221. Recap complet git init git status (--short) git help <commande> git add <fichier> git reset -- <fichier> git commit -m "message" git mv git rm git log (--oneline) (--summary) (--graph) git show <commit ou branche> git diff (--staged) (--word-diff) git clone git pull (<remote> <branche>) git push ((-u) <remote> <branche>) git remote (add <remote> <url>) git branch ((-d) <branche>) git checkout (-b) <branche> git merge
222. Recap complet git init git status (--short) git help <commande> git add <fichier> git reset -- <fichier> git commit -m "message" git mv git rm git log (--oneline) (--summary) (--graph) git show <commit ou branche> git diff (--staged) (--word-diff) git clone git pull (<remote> <branche>) git push ((-u) <remote> <branche>) git remote (add <remote> <url>) git branch ((-d) <branche>) git checkout (-b) <branche> git merge Aller plus loin
223. Recap complet git init git status (--short) git help <commande> git add <fichier> git reset -- <fichier> git commit -m "message" git mv git rm git log (--oneline) (--summary) (--graph) git show <commit ou branche> git diff (--staged) (--word-diff) git clone git pull (<remote> <branche>) git push ((-u) <remote> <branche>) git remote (add <remote> <url>) git branch ((-d) <branche>) git checkout (-b) <branche> git merge Aller plus loin git tag git alias git rebase git cherry-pick git bisect git blame git fetch git stash .gitignore