GIT

indroduction

Transcript

1. Getting Git Scott Chacon
2. 2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min
3. 2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 2m This Slide 10% 4 min
4. 2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 2m Who is Scott? 10% 4 min
5. 2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 75% 35 min 3m What is Git?
6. 2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 75% 35 min 20m How Does Git Work?
7. 2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 75% 35 min 12m How Do I Use Git?
8. 2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 4m How Do I Deploy with Git? 15% 6 min
9. 2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 2m Where Can I Learn More? 15% 6 min
10. Who Is Scott? Introducing myself...
11. 2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 2m Who is Scott? 10% 4 min
12. Scott Anthony Chacon
13. github.com/schacon
15. www.gitcasts.com
17. Rails Git Xen 3D Cameras Huge Flat Screens jepoirrier@flickr
19. me
20. introduce yourself
21. introduce yourself and your sweet projects...
22. why is scott here?
23. What is Git?
24. 2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 75% 35 min 3m What is Git?
25. git is
26. directory content management system git is
27. tree history storage system git is
28. stupid content tracker git is
29. a toolkit git is
32. the “plumbing”
35. the “porcelain”
37. not subversion! git is
38. forget subversion!
39. not an evolution
40. svn rcs cvs git not an evolution
41. svn rcs cvs git not an evolution
42. svn rcs cvs git not an evolution
43. source control taxonomy
44. source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage
45. source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage
46. source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage
47. source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage
48. source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage
49. source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage
50. source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage
51. source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage
52. source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage
53. source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage
54. source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage
55. source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage
56. source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage
57. source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage
58. source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage
59. svn cvs git perforce mercurial time machine cp -r rcs source control taxonomy darcs delta storage DAG storage bazzar bitkeeper local centralized distributed local centralized distributed source control taxonomy
60. svn cvs git perforce mercurial time machine cp -r rcs source control taxonomy darcs delta storage DAG storage bazzar bitkeeper local centralized distributed local centralized distributed source control taxonomy
61. svn cvs git perforce mercurial time machine cp -r rcs source control taxonomy darcs delta storage DAG storage bazzar bitkeeper local centralized distributed local centralized distributed source control taxonomy
62. svn cvs git perforce mercurial time machine cp -r rcs source control taxonomy darcs delta storage DAG storage bazzar bitkeeper local centralized distributed local centralized distributed source control taxonomy
63. svn cvs git perforce mercurial time machine cp -r rcs source control taxonomy darcs delta storage DAG storage bazzar bitkeeper local centralized distributed local centralized distributed source control taxonomy
64. svn cvs git perforce mercurial time machine cp -r rcs source control taxonomy darcs delta storage DAG storage bazzar bitkeeper local centralized distributed local centralized distributed source control taxonomy
65. svn cvs git perforce mercurial time machine cp -r rcs source control taxonomy darcs delta storage DAG storage bazzar bitkeeper local centralized distributed local centralized distributed source control taxonomy
66. svn cvs git perforce mercurial time machine cp -r rcs source control taxonomy darcs delta storage DAG storage bazzar bitkeeper local centralized distributed local centralized distributed source control taxonomy
67. svn cvs git perforce mercurial time machine cp -r rcs source control taxonomy darcs delta storage DAG storage bazzar bitkeeper local centralized distributed local centralized distributed source control taxonomy bazaar
68. How Does Git Work?
69. How Does Git Work? ?
70. 2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 75% 35 min 20m How Does Git Work?
71. git
72. git directory
73. git directory .git
74. git directory .git GIT_DIR
75. Git Directory config file hooks index object database references
76. object database
77. object database content
78. object database new_content = type + ’ ‘ + content.size + \0 + content content
79. object database new_content = type + ’ ‘ + content.size + \0 + content content “header”
80. object database new_content = type + ’ ‘ + content.size + \0 + content sha = Digest::SHA1.hexdigest(new_content) content
81. object database new_content = type + ’ ‘ + content.size + \0 + content sha = Digest::SHA1.hexdigest(new_content) content “824aed035c0aa75d64c...”
82. object database new_content = type + ’ ‘ + content.size + \0 + content compressed = zlib::deflate(new_content) sha = Digest::SHA1.hexdigest(new_content) content “824aed035c0aa75d64c...”
83. object database new_content = type + ’ ‘ + content.size + \0 + content compressed = zlib::deflate(new_content) sha = Digest::SHA1.hexdigest(new_content) content “824aed035c0aa75d64c...” path = “.git/objects/82/4aed035c0aa75d64c...”
84. object database new_content = type + ’ ‘ + content.size + \0 + content compressed = zlib::deflate(new_content) sha = Digest::SHA1.hexdigest(new_content) content “824aed035c0aa75d64c...” path = “.git/objects/82/4aed035c0aa75d64c...” File.open(path, ‘w’) {|f| f.write(compressed)}
85. object database new_content = type + ’ ‘ + content.size + \0 + content compressed = zlib::deflate(new_content) sha = Digest::SHA1.hexdigest(new_content) content “824aed035c0aa75d64c...” path = “.git/objects/82/4aed035c0aa75d64c...” File.open(path, ‘w’) {|f| f.write(compressed)} “loose” format
86. object database git gc
87. object database git gc same file with minor differences
88. object database .git/objects/f1/032eed02413a1145c... git gc .git/objects/45/b983be36b73c0788d... .git/objects/04/fb8aee105e6e445e8... .git/objects/63/874f37013c1740acd... .git/objects/1d/c9cbcb76cbb80fce1... .git/objects/82/4aed035c0aa75d64c... same file with minor differences
89. object database .git/objects/f1/032eed02413a1145c... git gc .git/objects/45/b983be36b73c0788d... .git/objects/04/fb8aee105e6e445e8... .git/objects/63/874f37013c1740acd... .git/objects/1d/c9cbcb76cbb80fce1... .git/objects/82/4aed035c0aa75d64c... .git/objects/pack/pack-999727..9f600.pack .git/objects/pack/pack-999727..9f600.idx same file with minor differences
90. object database .git/objects/f1/032eed02413a1145c... git gc .git/objects/45/b983be36b73c0788d... .git/objects/04/fb8aee105e6e445e8... .git/objects/63/874f37013c1740acd... .git/objects/1d/c9cbcb76cbb80fce1... .git/objects/82/4aed035c0aa75d64c... .git/objects/pack/pack-999727..9f600.pack .git/objects/pack/pack-999727..9f600.idx same file with minor differences
91. object database .git/objects/f1/032eed02413a1145c... git gc .git/objects/45/b983be36b73c0788d... .git/objects/04/fb8aee105e6e445e8... .git/objects/63/874f37013c1740acd... .git/objects/1d/c9cbcb76cbb80fce1... .git/objects/82/4aed035c0aa75d64c... .git/objects/pack/pack-999727..9f600.pack .git/objects/pack/pack-999727..9f600.idx same file with minor differences “packed” format
92. object database all git objects are stored this way
93. object database new_content = type + ’ ‘ + content.size + \0 + content 4 types of git objects
94. object database blob
95. object database blob tree
96. object database commit blob tree
97. object database commit tag blob tree
98. object database blob
99. Rakele README simplegit.rb ./ lib/ blob : a874b7 blob : a906cb blob : a0a60a Working Directory Git Directory object database blob
100. object database { SimpleGit Ruby Library ====================== This library calls git commands and returns the output. Author : Scott Chacon blob [content size]\0 Zlib::Inflate blob : a906cb zlib::deflate
101. object database { SimpleGit Ruby Library ====================== This library calls git commands and returns the output. Author : Scott Chacon blob [content size]\0 Zlib::Inflate blob : a906cb content zlib::deflate
102. object database { SimpleGit Ruby Library ====================== This library calls git commands and returns the output. Author : Scott Chacon blob [content size]\0 Zlib::Inflate blob : a906cb content header zlib::deflate
103. object database { SimpleGit Ruby Library ====================== This library calls git commands and returns the output. Author : Scott Chacon blob [content size]\0 Zlib::Inflate blob : a906cb content header compress zlib::deflate
104. object database { SimpleGit Ruby Library ====================== This library calls git commands and returns the output. Author : Scott Chacon blob [content size]\0 Zlib::Inflate blob : a906cb content header compress object zlib::deflate
105. object database commit tag blob tree
106. object database tree
107. object database tree Rakele README simplegit.rb ./ lib/ blob : a874b7 blob : a906cb blob : a0a60a Working Directory Git Directory
108. object database tree Rakele README simplegit.rb ./ lib/ tree : 1a738d tree : fe8971 Working Directory Git Directory blob : a874b7 blob : a906cb blob : a0a60a
109. object database { 100644 blob a906cb README 100644 blob a874b7 Rakefile 040000 tree fe8971 lib tree [content size]\0 tree : 1a738d Zlib::Inflate zlib::deflate
110. object database { 100644 blob a906cb README 100644 blob a874b7 Rakefile 040000 tree fe8971 lib tree [content size]\0 tree : 1a738d Zlib::Inflate filename “inode” info zlib::deflate
111. object database { 100644 blob a906cb README 100644 blob a874b7 Rakefile 040000 tree fe8971 lib tree [content size]\0 tree : 1a738d Zlib::Inflate “block pointer” type mode zlib::deflate
112. object database commit tag blob tree
113. object database commit
114. commit tree blob tree tree blob blob branch HEAD object database commit
115. object database { Zlib::Inflate tree e1b3ec parent a11bef author Scott Chacon <schacon@gmail.com> 1205624433 committer Scott Chacon <schacon@gmail.com> 1205624433 my second commit, which is better than the first commit [content size]\0 commit : e1b3ec zlib::deflate
116. object database { Zlib::Inflate tree e1b3ec parent a11bef author Scott Chacon <schacon@gmail.com> 1205624433 committer Scott Chacon <schacon@gmail.com> 1205624433 my second commit, which is better than the first commit [content size]\0 commit : e1b3ec zlib::deflate
117. object database { Zlib::Inflate tree e1b3ec parent a11bef author Scott Chacon <schacon@gmail.com> 1205624433 committer Scott Chacon <schacon@gmail.com> 1205624433 my second commit, which is better than the first commit [content size]\0 commit : e1b3ec zlib::deflate
118. object database { Zlib::Inflate tree e1b3ec parent a11bef author Scott Chacon <schacon@gmail.com> 1205624433 committer Scott Chacon <schacon@gmail.com> 1205624433 my second commit, which is better than the first commit [content size]\0 commit : e1b3ec zlib::deflate
119. object database { Zlib::Inflate tree e1b3ec parent a11bef author Scott Chacon <schacon@gmail.com> 1205624433 committer Scott Chacon <schacon@gmail.com> 1205624433 my second commit, which is better than the first commit [content size]\0 commit : e1b3ec zlib::deflate
120. blob branch commit remote tree tag object database
121. object database commit tag blob tree
122. object database tag
123. blob branch HEAD commit remote tree tag object database tag
124. object database { Zlib::Inflate object 0576fa type commit tag v0.1 tagger Scott Chacon <schacon@gmail.com> 1205624655 this is my v0.1 tag tag [content size]\0 tag : 0c819c zlib::deflate
125. object database { Zlib::Inflate object 0576fa type commit tag v0.1 tagger Scott Chacon <schacon@gmail.com> 1205624655 this is my v0.1 tag tag [content size]\0 tag : 0c819c zlib::deflate
126. object database { Zlib::Inflate object 0576fa type commit tag v0.1 tagger Scott Chacon <schacon@gmail.com> 1205624655 this is my v0.1 tag tag [content size]\0 tag : 0c819c zlib::deflate
127. object database { Zlib::Inflate object 0576fa type commit tag v0.1 tagger Scott Chacon <schacon@gmail.com> 1205624655 this is my v0.1 tag tag [content size]\0 tag : 0c819c zlib::deflate
128. object database { Zlib::Inflate object 0576fa type commit tag v0.1 tagger Scott Chacon <schacon@gmail.com> 1205624655 this is my v0.1 tag tag [content size]\0 tag : 0c819c zlib::deflate
129. object database commit tag blob tree
130. object database commit tag blob tree immutable
131. object database commit tag blob tree immutable can’t be muted
132. Git Directory config file hooks index object database references
133. references
134. blob branch HEAD commit remote tree tag references lightweight, movable pointers to a commit
135. blob branch HEAD commit remote tree tag references lightweight, movable pointers to a commit stored in .git/refs/* as simple files
136. blob branch HEAD commit remote tree tag references
137. the object model
138. commit tree blob tree tree blob blob branch HEAD
139. commit tree blob tree tree blob blob branch HEAD
140. commit tree blob tree tree blob blob branch HEAD
141. commit tree blob tree tree commit tree blob tree tree blob blob branch HEAD tag
142. commit tree blob tree tree commit tree blob tree tree blob blob branch HEAD tag
143. commit tree blob tree tree commit tree blob tree tree blob blob branch HEAD tag
144. commit tree blob tree tree commit tree blob tree tree blob blob branch HEAD tag
145. commit tree blob tree tree commit tree blob tree tree blob blob branch HEAD tag
146. commit tree blob tree tree commit tree blob tree tree blob blob branch HEAD tag
147. commit tag tree blob tree tree commit tree blob tree tree blob commit tree blob blob branch HEAD
148. commit tag tree blob tree tree commit tree blob tree tree blob commit tree blob blob branch HEAD
149. commit tag tree blob tree tree commit tree blob tree tree blob commit tree blob blob branch HEAD
150. commit tag tree blob tree tree commit tree blob tree tree blob commit tree blob blob branch HEAD
151. commit tag tree blob tree tree commit tree blob tree tree blob commit tree blob blob branch HEAD
152. commit tag tree blob tree tree commit tree blob tree tree blob commit tree blob blob branch HEAD
153. commit : a11bef tag : 0c819c tree : 1a738d tree : fe8971 blob : a874b7 blob : a906cb blob : a0a60a README Rakefile lib simplegit.rb $ git checkout v0.1 .git/refs/tags/v0.1 "0c819c" 1 2 3
154. commit : a11bef tag : 0c819c tree : 1a738d tree : fe8971 blob : a874b7 blob : a906cb blob : a0a60a README Rakefile lib simplegit.rb $ git checkout v0.1 .git/refs/tags/v0.1 "0c819c" 1 2 3
155. commit : a11bef tag : 0c819c tree : 1a738d tree : fe8971 blob : a874b7 blob : a906cb blob : a0a60a README Rakefile lib simplegit.rb $ git checkout v0.1 .git/refs/tags/v0.1 "0c819c" 1 2 3
156. commit : a11bef tag : 0c819c tree : 1a738d tree : fe8971 blob : a874b7 blob : a906cb blob : a0a60a README Rakefile lib simplegit.rb $ git checkout v0.1 .git/refs/tags/v0.1 "0c819c" 1 2 3
157. commit : a11bef tag : 0c819c tree : 1a738d tree : fe8971 blob : a874b7 blob : a906cb blob : a0a60a README Rakefile lib simplegit.rb $ git checkout v0.1 .git/refs/tags/v0.1 "0c819c" 1 2 3
158. the commit history
159. blob commit tree C1 } branch branch
160. branching and merging
161. C1 master C0 C2 C3 experiment HEAD
162. C1 master C0 C2 C3 experiment C3 C4 experiment C5 git checkout -b experiment HEAD
163. C1 master C0 C2 C3 experiment master 2 C3 C4 experiment C5 T1 git commit HEAD
164. C1 master C0 C2 C3 experiment C1 master C2 C3 C4 experiment C5 T1 git commit git commit HEAD
165. C1 master C0 C2 C3 experiment C1 master C2 C3 C4 experiment C5 T1 HEAD git checkout master
166. C1 master C0 C2 C3 C4 experiment C5 T1 C1 master C2 C3 C4 experiment C5 T1 git commit HEAD
167. C1 master C0 C2 C3 C4 experiment C5 T1 C1 master C2 C3 C4 experiment C5 T1 git tag -a ‘v1.1’ HEAD
168. C1 master C0 C2 C3 C4 experiment C5 T1 git checkout experiment git commit HEAD
169. C1 C0 C2 C3 C4 experiment C5 C6 master T1 git checkout master git merge experiment HEAD
170. remotes
171. C1 origin/master C0 C2 master C2 master
172. C1 origin/master C0 C2 master C2 master
173. C1 origin/master C0 C2 master C1 aster C2 master
174. git fetch origin CL1 origin/master C0 CL2 master CR3 CR1 CR4 origin/idea CR2
175. CL1 origin/master C0 CL2 master CR3 CR1 CR4 origin/idea CR2 git fetch origin
176. CL1 origin/master C0 CL2 master CR3 CR1 CR4 origin/idea CR2 git checkout -b tryidea origin/master CL2 master CR3 CR4 in/idea CR2 tryidea CL3
177. CL1 origin/master C0 CL2 master CR3 CR1 CR4 origin/idea CR2 tryidea CL3 git merge origin/master origin/idea
178. CL1 origin/master C0 CL2 master CR3 CR1 CR4 origin/idea CR2 tryidea CL3
179. CL1 origin/master C0 CL2 master CR3 CR1 CR4 origin/idea CR2
180. remote workflow
181. public repo local repo local repo public repo internet A B C
182. public repo local repo local repo public repo git push (ssh) internet A B C A B C
183. public repo local repo local repo public repo git push (ssh) git fetch (git) internet A B C A B C A B C
184. public repo local repo local repo public repo git push (ssh) git fetch (git) internet A B C A B C A B C D E F git commit
185. public repo local repo local repo public repo git push (ssh) git fetch (git) git push (ssh) internet A B C A B C A B C D E F A B C D E F
186. public repo local repo local repo public repo git fetch (http) git push (ssh) git fetch (git) git push (ssh) internet A B C A B C A B C D E F A B C D E F D E F
187. public repo local repo local repo public repo git fetch (http) git push (ssh) git fetch (git) git push (ssh) internet A B C A B C A B C D E F A B C D E F D E F D E F
188. multiple remotes
189. developer nick developer jessica my repo 5ec e4a 4a7 ce0 master
190. developer nick developer jessica my repo 5ec e4a 4a7 ce0 master commit
191. developer nick developer jessica my repo 5ec e4a 4a7 ce0 master tree
192. developer nick developer jessica my repo 5ec e4a 4a7 ce0 master blobs
193. schacon/ project developer nick developer jessica "public" my repo 5ec e4a 4a7 ce0 master git push public public/master 5ec e4a 4a7 ce0
194. schacon/ project developer jessica "public" my repo 5ec e4a 4a7 ce0 master git clone (url) public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick
195. schacon/ project developer jessica "public" my repo 5ec e4a 4a7 ce0 master git commit public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f
196. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f git clone (url) 5ec e4a 4a7 ce0 developer jessica
197. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git commit
198. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git push 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09
199. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git remote add nick git://github.com/nickh/project.git 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" git remote add nick git://github.com/nickh/project.git
200. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git remote add nick git://github.com/nickh/project.git 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" “nick” git remote add nick git://github.com/nickh/project.git
201. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git remote add jess git://github.com/jessica/project.git 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" git remote add jess git://github.com/jessica/project.git
202. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git remote add jess git://github.com/jessica/project.git 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" git remote add jess git://github.com/jessica/project.git “jess”
203. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git remote add jess git://github.com/jessica/project.git 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 git fetch nick 5ec c12 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "jess" c12 ec5 24f nick/master git fetch nick
204. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git fetch nick 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" c12 ec5 24f nick/master
205. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git remote add jess git://github.com/jessica/project.git 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" git fetch jess schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/m e4a git fetch jess e4a nickh/ project c12 ec5 24f jessic proje "nick" "jess ec5 24f nick/mas 2fb df7 4ea a09 jess/mas c12 schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git fetch nick 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" c12 ec5 24f nick/master
206. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git fetch jess 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" ec5 24f nick/master 2fb df7 4ea a09 jess/master c12
207. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" ec5 24f nick/master 2fb df7 4ea a09 jess/master c12 b3b c63 git merge nick jess
208. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git push public 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" ec5 24f nick/master 2fb df7 4ea a09 jess/master c12 b3b c63 e4a ec5 24f 2fb df7 4ea a09 c12 b3b c63
209. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" ec5 24f nick/master 2fb df7 4ea a09 jess/master c12 b3b c63 e4a ec5 24f 2fb df7 4ea a09 c12 b3b c63
210. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" ec5 24f nick/master 2fb df7 4ea a09 jess/master c12 b3b c63 e4a ec5 24f 2fb df7 4ea a09 c12 b3b c63
211. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" ec5 24f nick/master 2fb df7 4ea a09 jess/master c12 b3b c63 e4a ec5 24f 2fb df7 4ea a09 c12 b3b c63
212. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" ec5 24f nick/master 2fb df7 4ea a09 jess/master c12 b3b c63 e4a ec5 24f 2fb df7 4ea a09 c12 b3b c63
213. rebasing
214. C1 C2 local jessica master
215. C1 master C2 C1 C2 local jessica master git clone
216. C1 master C2 C3 C4 C1 C2 C5 C6 local jessica master git commit git commit
217. C1 master C2 C3 C4 C1 C2 local jessica pack master git fetch jess C6 C5
218. C1 jess/master C2 C3 C4 C5 C6 local master
219. C1 jess/master C2 C3 C4 C5 C6 master git merge
220. C1 jess/master C2 C3 C4 C5 C6 git merge C7 master
221. C1 jess/master C2 C3 C4 C5 C6 git merge C7 master C1 jess/master C2 C3 C4 C5 C6 master git rebase
222. C3' C4' C3 C4 C1 jess/master C2 C3 C4 C5 C6 git merge C7 master C1 jess/master C2 C5 C6 master git rebase
223. C3' C4' C3 C4 C1 jess/master C2 C3 C4 C5 C6 git merge C7 master C1 jess/master C2 C5 C6 master git rebase
224. C3' C4' C3 C4 C1 jess/master C2 C3 C4 C5 C6 git merge C7 master C1 jess/master C2 C5 C6 master git rebase 1 2
225. C3' C4' C3 C4 C1 jess/master C2 C3 C4 C5 C6 git merge C7 master C1 jess/master C2 C5 C6 master git rebase 1 2
226. C3' C4' C3 C4 C1 jess/master C2 C3 C4 C5 C6 git merge C7 master C1 jess/master C2 C5 C6 master git rebase
227. C3' C4' C1 jess/master C2 C3 C4 C5 C6 git merge C7 master C1 jess/master C2 C5 C6 master git rebase
228. the treeish
229. the treeish alternate ways to refer to objects or ranges of objects
230. Treeish • full sha-1 • partial sha-1 • branch or tag name • date spec • ordinal spec • carrot parent • tilde spec • tree pointer • blob spec • ranges
231. Full SHA1 6e453f523fa1da50ecb04431101112b3611c6a4d
232. Partial SHA1 6e453f523fa1da50ecb04431101112b3611c6a4d 6e453f523fa1da50 6e453
233. Branch, Remote or Tag Name v1.0 master origin/testing
234. Date Spec master@{yesterday} master@{1 month ago}
235. Ordinal Spec master@{5} 5th prior value of ‘master’
236. Carrot Parent master^2 2nd parent of ‘master’
237. Tilde Spec master~2 2nd generation grandparent of ‘master’
238. Tree Pointer master^{tree} tree that ‘master’ points to
239. Blob Spec master:/path/to/file blob of that file in ‘master’ commit
240. Ranges ce0e4..e4272 everything between two commits
241. Ranges ce0e4.. everything since a commit
242. examples
243. ce0e4 master 5ec47 2f45e 4eadf 2fbb3 18cae b3be1 a09c6 df2fa c36ae jess/master
244. ce0e4 master 5ec47 2f45e 4eadf 2fbb3 18cae b3be1 a09c6 df2fa c36ae jess/master master^
245. ce0e4 master 5ec47 2f45e 4eadf 2fbb3 18cae b3be1 a09c6 df2fa c36ae jess/master master^2
246. ce0e4 master 5ec47 2f45e 4eadf 2fbb3 18cae b3be1 a09c6 df2fa c36ae jess/master master~2
247. ce0e4 master 5ec47 2f45e 4eadf 2fbb3 18cae b3be1 a09c6 df2fa c36ae jess/master master^^^2 master~2^2
248. ce0e4 master 5ec47 2f45e 4eadf 2fbb3 18cae b3be1 a09c6 df2fa c36ae jess/master master^^^2 master~2^2
249. ce0e4 master 5ec47 2f45e 4eadf 2fbb3 18cae b3be1 a09c6 df2fa c36ae jess/master master^^^2 master~2^2
250. ce0e4 master 5ec47 2f45e 4eadf 2fbb3 18cae b3be1 a09c6 df2fa c36ae jess/master master~3..master^
251. local stuff
252. the index
253. Git Directory config file hooks index object database references
254. index
255. index working directory repository index git add git commit
256. index working directory repository index git add git commit
257. index working directory repository index git add git commit
258. what?
259. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD git wdir mtime fname Object Directory Working Directory Index project/.git/index project/ project/.git/objects stage
260. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD git wdir mtime fname Object Directory Working Directory Index project/.git/index project/ project/.git/objects stage git checkout
261. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects e4a 24f e4a 24f file1 file2 1:30 1:30 git wdir mtime fname Index project/.git/index e4a 24f stage /file1 /file2 1:30 1:30 git checkout 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD git wdir mtime fname Object Directory Working Directory Index project/.git/index project/ project/.git/objects stage
262. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects e4a 24f e4a 24f file1 file2 1:30 1:30 git wdir mtime fname Index project/.git/index e4a 24f stage /file1 /file2 1:30 1:30 git checkout 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD git wdir mtime fname Object Directory Working Directory Index project/.git/index project/ project/.git/objects stage
263. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects e4a 24f e4a 24f file1 file2 1:30 1:30 git wdir mtime fname Index project/.git/index e4a 24f stage /file1 /file2 1:30 1:30 git checkout 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD git wdir mtime fname Object Directory Working Directory Index project/.git/index project/ project/.git/objects stage
264. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects e4a 24f e4a 24f file1 file2 1:30 1:30 git wdir mtime fname Index project/.git/index e4a 24f stage /file1 /file2 1:30 1:30 git checkout 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD git wdir mtime fname Object Directory Working Directory Index project/.git/index project/ project/.git/objects stage
265. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects e4a 24f e4a 24f file1 file2 1:30 1:30 git wdir mtime fname Index project/.git/index e4a 24f stage /file1 /file2 1:30 1:30 git checkout 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD git wdir mtime fname Object Directory Working Directory Index project/.git/index project/ project/.git/objects stage
266. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects e4a 24f e4a 24f file1 file2 1:30 1:30 git wdir mtime fname Index project/.git/index e4a 24f stage /file1 /file2 1:30 1:30 git checkout
267. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects e4a 24f e4a 24f file1 file2 1:30 1:30 git wdir mtime fname Index project/.git/index e4a 24f stage /file1 /file2 1:30 1:31 vim file2
268. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f e4a 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index e4a 24f stage /file1 /file2 1:30 1:31 git status
269. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f e4a 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index e4a 24f stage /file1 /file2 1:30 1:31 git status
270. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f e4a 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index e4a 24f stage /file1 /file2 1:30 1:31 git status
271. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f e4a 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index e4a 24f stage /file1 /file2 1:30 1:31
272. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f e4a 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:30 1:31 1ba git add file2
273. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f e4a 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:30 1:31 1ba git add file2
274. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f e4a 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:30 1:31 1ba git add file2
275. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f e4a 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:30 1:31 1ba git add file2
276. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f e4a 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:30 1:31 1ba git status
277. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f e4a 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:30 1:31 1ba git status
278. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f 1ba 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:30 1:31 1ba a3e 83d git commit
279. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f 1ba 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:30 1:31 1ba a3e 83d git commit
280. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f 1ba 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:30 1:31 1ba a3e 83d git commit
281. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f 1ba 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:30 1:31 1ba a3e 83d git commit
282. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 6d4 91b 1ba 24f file1 file2 1:32 1:32 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:32 1:32 1ba a3e 83d vim file1 file2 git status
283. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 6d4 91b 1ba 24f file1 file2 1:32 1:32 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:32 1:32 1ba a3e 83d vim file1 file2 git status
284. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 6d4 91b 1ba 24f file1 file2 1:32 1:32 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:32 1:32 1ba a3e 83d vim file1 file2 git status
285. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 6d4 91b 1ba 24f file1 file2 1:32 1:32 git wdir mtime fname Index project/.git/index 1ba 91b stage /file1 /file2 1:32 1:32 1ba a3e 83d 91b git add file1
286. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 6d4 91b 1ba 24f file1 file2 1:32 1:32 git wdir mtime fname Index project/.git/index 1ba 91b stage /file1 /file2 1:32 1:32 1ba a3e 83d 91b git add file1
287. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 6d4 91b 1ba 24f file1 file2 1:32 1:32 git wdir mtime fname Index project/.git/index 1ba 91b stage /file1 /file2 1:32 1:32 1ba a3e 83d 91b git add file1
288. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 6d4 91b 1ba 24f file1 file2 1:32 1:32 git wdir mtime fname Index project/.git/index 1ba 91b stage /file1 /file2 1:32 1:32 1ba a3e 83d 91b git status
289. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 6d4 91b 1ba 24f file1 file2 1:32 1:32 git wdir mtime fname Index project/.git/index 1ba 91b stage /file1 /file2 1:32 1:32 1ba a3e 83d 91b git status
290. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 6d4 91b 1ba 24f file1 file2 1:32 1:32 git wdir mtime fname Index project/.git/index 1ba 91b stage /file1 /file2 1:32 1:32 1ba a3e 83d 91b git status
291. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 6d4 91b 1ba 91b file1 file2 1:32 1:32 git wdir mtime fname Index project/.git/index 1ba 91b stage /file1 /file2 1:32 1:32 1ba a3e 83d 91b 1a7 6c5 git commit
292. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 6d4 91b 1ba 91b file1 file2 1:32 1:32 git wdir mtime fname Index project/.git/index 1ba 91b stage /file1 /file2 1:32 1:32 1ba a3e 83d 91b 1a7 6c5 git commit
293. 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 6d4 91b 1ba 91b file1 file2 1:32 1:32 git wdir mtime fname Index project/.git/index 1ba 91b stage /file1 /file2 1:32 1:32 1ba a3e 83d 91b 1a7 6c5
294. How Do I Use Git?
295. 2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 75% 35 min 12m How Do I Use Git?
296. 152 Total Commands
297. 43 Porcelain Commands
298. We’ll Cover Half
299. getting git
300. git.or.cz
301. git.or.cz wget make make install
302. yum install git-core apt-get install git-core port install git-core +svn
303. setup
304. git config --global user.name “Scott Chacon” git config --global user.email “schacon@gmail.com”
307. 1 Down
308. getting a repo
309. git clone
310. Git Protocols ssh:// http[s]:// git:// file:/// rsync://
311. Git Protocols ssh:// http[s]:// git:// file:/// rsync://
312. Git Protocols ssh:// http[s]:// git:// file:/// rsync:// push
313. Git Protocols ssh:// http[s]:// git:// file:/// rsync:// pull
314. git clone
315. git clone
316. git clone
317. git clone
318. initializing a repo cd myproject git init git add . git commit
325. 5 Down
326. normal workflow
327. .gitignore
330. adding and committing
336. working directory repository index git add git com
339. working directory repository index git add git commit
340. git log
349. git log --pretty
356. 6 Down
357. git diff
358. git diff (treeish1) (treeish2)
359. git diff master^ > change.diff
360. git diff master^ > change.diff patch -p1 < change.diff
361. git diff master^ > change.diff patch -p1 < change.diff git apply change.diff or
362. git and patches
363. Single Commit git format-patch origin/master --stdout > story.patch git am < story.patch
364. Multiple Commits $ git format-patch -o patches origin $ git send-email --to list@email.com patches $ git am mbox
365. Multiple Commits $ git format-patch -o patches origin $ git send-email --to list@email.com patches $ git am mbox 1 patch file per commit in this directory
366. example: patching rails
367. Patching Rails git clone git://github.com/rails/rails.git cd rails; (vim/emacs etc) git format-patch origin/master --stdout > story.patch upload story.patch to rails.lighthouseapp.com
368. Applying a Rails Patch download story.patch from rails.lighthouseapp.com git am < story.patch
369. 11 Down
370. branch, merge, rebase
371. master develop topic
372. master develop topic
373. master develop topic
374. master develop topic
375. master develop topic
376. master develop topic
377. master develop topic
378. master develop topic “production”
379. master develop topic “production” “trunk”
380. master develop topic “production” “trunk” convention!
381. branching workflow normal development want to try an idea have to do a hotfix merge idea into development push to production
382. branching workflow normal development want to try an idea have to do a hotfix merge idea into development push to production
390. C3 master C0 develop story95 C4 C1 C2 idea
391. branching workflow normal development want to try an idea have to do a hotfix merge idea into development push to production
395. C3 master C0 develop story95 C4 C1 C2 idea
396. C3 master C0 develop story95 C4 C1 C2 idea
399. idea C3 master C0 develop story95 C4 C1 C2 C5 C6 master
400. branching workflow normal development want to try an idea have to do a hotfix merge idea into development push to production
406. idea C3 master C0 develop story95 C4 C1 C2 C5 C6 master
407. branching workflow normal development want to try an idea have to do a hotfix merge idea into development push to production
412. develop C3 C0 story95 C4 C1 C2 C5 C6 master
413. branching workflow normal development want to try an idea have to do a hotfix merge idea into development push to production
416. develop C3 C0 story95 C4 C1 C2 C5 C6 C7 master
419. develop C4 C0 story95 C5 C1 C2 C6' C3 master
420. develop C4 C0 story95 C5 C1 C2 C6' C3 master
421. develop C4 C0 story95 C5 C1 C2 C6' C3 master
422. develop C3 C0 story95 C4 C1 C2 C5 C6 C7 master merge rebase develop C4 C0 story95 C5 C1 C2 C6' C3 master
423. one more time now!
424. C3 master C0 develop story95 C4 C1 C2 idea
425. C3 master C0 develop story95 C4 C1 C2 idea git checkout -b idea
426. idea C3 master C0 develop story95 C4 C1 C2 C5 C6 master git commit
427. idea C3 master C0 develop story95 C4 C1 C2 C5 C6 master git checkout master git commit
428. develop C3 C0 story95 C4 C1 C2 C5 C6 master git checkout idea git merge develop git branch -d idea
429. develop C3 C0 story95 C4 C1 C2 C5 C6 C7 master git checkout master git merge develop
430. 17 Down
431. sharing git
449. git clone git://github.com/schacon/simplegit2.git
450. distributed workflow
451. distributed workflow fetch, pull and push
452. fetch
459. pull
460. pull = fetch + merge
461. push
465. git push
467. We Know Em All!
468. review
469. • Local Commands • git config • git init • git add • git commit • git status • git tag • git log
470. • Local Commands • git config • git init • git add • git commit • git status • git tag • git log • Branchy Commands • git checkout • git branch • git merge • git rebase
471. • Local Commands • git config • git init • git add • git commit • git status • git tag • git log • Branchy Commands • git checkout • git branch • git merge • git rebase • Remotey Commands • git remote • git fetch • git pull • git clone • git push
472. • Local Commands • git config • git init • git add • git commit • git status • git tag • git log • Branchy Commands • git checkout • git branch • git merge • git rebase • Remotey Commands • git remote • git fetch • git pull • git clone • git push • Patchy Commands • git diff • git apply • git format-patch • git am
473. • Local Commands • git config • git init • git add • git commit • git status • git tag • git log • Branchy Commands • git checkout • git branch • git merge • git rebase • Remotey Commands • git remote • git fetch • git pull • git clone • git push • Patchy Commands • git diff • git apply • git format-patch • git am
474. popular workflows
475. central repository model
476. developer developer developer shared repository developer developer developer developer developer developer
477. developer shared repository developer developer git clone
478. developer shared repository developer developer git push
479. developer shared repository developer developer git push
480. developer shared repository developer developer
481. developer shared repository developer developer git fetch git merge
482. developer shared repository developer developer git push
483. dictator and lieutenants model
484. developer developer dictator developer lieutenant blessed repository developer lieutenant
485. developer developer dictator developer lieutenant blessed repository developer lieutenant git clone
486. developer developer dictator developer lieutenant blessed repository developer lieutenant git fetch git merge
487. developer developer dictator developer lieutenant blessed repository developer lieutenant git fetch git merge
488. developer developer dictator developer lieutenant blessed repository developer lieutenant git fetch; git merge
489. developer developer dictator developer lieutenant blessed repository developer lieutenant git push
490. developer developer dictator developer lieutenant blessed repository developer lieutenant git fetch
491. integration manager model
492. developer public developer public integration manager blessed repository developer private developer private
493. developer public developer public integration manager blessed repository developer private developer private github.com /schacon/ticgit /yob/ticgit /pope/ticgit
494. developer public developer public integration manager blessed repository developer private developer private github.com /schacon/ticgit /yob/ticgit /pope/ticgit “forks”
495. developer public developer public integration manager blessed repository developer private developer private git push
496. developer public developer public integration manager blessed repository developer private developer private git clone
497. developer public developer public integration manager blessed repository developer private developer private git push
498. developer public developer public integration manager blessed repository developer private developer private git fetch git merge
499. developer public developer public integration manager blessed repository developer private developer private git push
500. developer public developer public integration manager blessed repository developer private developer private git fetch git rebase / merge
501. developer public developer public integration manager blessed repository developer private developer private git push
502. How Do I Deploy with Git?
503. 2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 4m How Do I Deploy with Git? 15% 6 min
504. capistrano + git
505. deploy.rb
506. deploy.rb
507. deploy.rb
511. other cap options set :branch, "master" set :git_shallow_clone, 1 set :git_enable_submodules, 1
512. ruby + git
513. ruby + git grit git gem git-ruby
514. ruby + git grit git gem git-ruby
517. github.com/schacon/ ruby-git
518. Where Can I Learn More?
519. 2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 2m Where Can I Learn More? 15% 6 min
520. Resources git.or.cz gitcasts.com del.icio.us/popular/git #git / #github on IRC peepcode - git book and screencast schacon@gmail.com me. here.
521. thats it!
522. thats it! gitcasts.com/git-talk notes, these slides, etc
523. thats it! gitcasts.com/git-talk notes, these slides, etc git.or.cz gitcasts.com del.icio.us/popular/git #git / #github on IRC peepcode schacon@gmail.com