Git 101 Presentation

1. Git 101 Scott Chacon

2. Introduction

4. Scott Chacon

6. git-scm.com

8. http://progit.org

9. [email protected]

10. @chacon twitter

11. </me>

12. What is Git?

13. Git is an open source, distributed version control system designed for speed and efﬁciency

14. version control

15. mercurial (hg) bazaar subversion (svn) version control concurrent version system (cvs) perforce visual source safe

16. SoS mercurial (hg) bazaar subversion (svn) version control concurrent version system (cvs) perforce visual source safe

17. SoS mercurial (hg) “not bad” bazaar subversion (svn) version control concurrent version system (cvs) perforce visual source safe

18. SoS mercurial (hg) bazaar subversion (svn) version control concurrent version system (cvs) perforce visual source safe “kill self”

19. git mercurial (hg) bazaar subversion (svn) version control concurrent version system (cvs) perforce visual source safe

21. git-scm.com

23. Fully Distributed

24. (almost) everything is local

25. which means everything is fast every clone is a backup work ofﬂine

26. No Network Needed Performing a diff Viewing ﬁle history Committing changes Merging branches Obtaining other revisions of a ﬁle Switching branches

29. Immutable

30. (almost) never removes data

31. Snapshots, not Patches

32.         delta storage             snapshot      storage          

47. Basic Git

48. First Steps

49. $ git config --global user.name “Scott Chacon” $ git config --global user.email “[email protected]”

50. Getting a Repo

51. Create One

52. git init

53. $ touch hello_world.rb $ git init $ git add . $ git commit -m ‘first commit’

63. Clone One

64. git clone

65. $ git clone git://github.com/schacon/ticgit.git Initialized empty Git repository in /private/tmp/ticgit/.git/ remote: Counting objects: 591, done. remote: Compressing objects: 100% (267/267), done. remote: Total 591 (delta 253), reused 587 (delta 252) Receiving objects: 100% (591/591), 73.05 KiB, done. Resolving deltas: 100% (253/253), done. $ cd ticgit/ $ ls LICENSE! ! Rakefile! examples! note! ! ticgit.gemspec README! ! bin! lib! spec ! ! $

68. $ git clone git://github.com/schacon/ticgit.git Initialized empty Git repository in /private/tmp/ticgit/.git/ remote: Counting objects: 591, done. remote: Compressing objects: 100% (267/267), done. remote: Total 591 (delta 253), reused 587 (delta 252) Receiving objects: 100% (591/591), 73.05 KiB, done. Resolving deltas: 100% (253/253), done. $ cd ticgit/ $ ls .git LICENSE! ! Rakefile! examples! note! ! ticgit.gemspec README!! bin!! lib!! spec $

69. A Basic Workﬂow

70. A Basic Workﬂow Edit ﬁles Stage the changes Review your changes Commit the changes

71. working directory git add index git commit repository

72. a working copy working directory of your project git add index git commit repository

73. working directory git add index git commit object database repository

74. working directory git add index “staging” git commit repository

76. $ find . ./app.yaml ./index.yaml ./main.py

77. $ vim main.py #!/usr/bin/env python import wsgiref.handlers from google.appengine.ext import webapp class MainHandler(webapp.RequestHandler): def get(self): self.response.out.write('Hello world!') def main(): application = webapp.WSGIApplication([('/', MainHandler)], debug=True) wsgiref.handlers.CGIHandler().run(application) if __name__ == '__main__': main() ~ ~ "main.py" 16L, 402C

78. $ vim main.py #!/usr/bin/env python import wsgiref.handlers from google.appengine.ext import webapp # this program prints out ‘hello world’ class MainHandler(webapp.RequestHandler): def get(self): self.response.out.write('Hello world!') def main(): application = webapp.WSGIApplication([('/', MainHandler)], debug=True) wsgiref.handlers.CGIHandler().run(application) if __name__ == '__main__': main() ~ ~ "main.py" 16L, 402C

79. $ git status

80. $ git status # On branch master # Changed but not updated: # (use "git add <file>..." to update what # # modified: main.py # no changes added to commit (use "git add" an

83. $ git status # On branch master # Changed but not STAGED updated: # (use "git add <file>..." to update what # # modified: main.py # no changes added to commit (use "git add" an

85. git add

88. $ git add main.py $ git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>. # # modified: main.py #

89. $ git add main.py $ git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>. # # modified: main.py #

90. $ git add main.py $ git status # On branch master # Changes to be committed: THAT ARE STAGED # (use "git reset HEAD <file>. # # modified: main.py #

91. $ vim app.yaml application: chacon version: 1 runtime: python api_version: 1 handlers: - url: .* script: main.py ~ ~ ~ "app.yaml" 8L, 101C

94. $ git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: main.py # # Changed but not updated: # (use "git add <file>..." to update what will be com # # modified: app.yaml #

95. $ vim main.py #!/usr/bin/env python import wsgiref.handlers from google.appengine.ext import webapp # this program prints out ‘hello world’ class MainHandler(webapp.RequestHandler): def get(self): self.response.out.write('Hello world!') def main(): application = webapp.WSGIApplication([('/', MainHandler)], debug=True) wsgiref.handlers.CGIHandler().run(application) if __name__ == '__main__': main() ~ ~ "main.py" 16L, 402C

96. $ vim main.py #!/usr/bin/env python import wsgiref.handlers from google.appengine.ext import webapp # this program prints out ‘hello world’ class MainHandler(webapp.RequestHandler): def get(self): self.response.out.write('Hola world!') def main(): application = webapp.WSGIApplication([('/', MainHandler)], debug=True) wsgiref.handlers.CGIHandler().run(application) if __name__ == '__main__': main() ~ ~ "main.py" 16L, 402C

97. $ vim main.py #!/usr/bin/env python import wsgiref.handlers from google.appengine.ext import webapp # this program prints out ‘hello world’ class MainHandler(webapp.RequestHandler): def get(self): self.response.out.write('Hola Mundo!') def main(): application = webapp.WSGIApplication([('/', MainHandler)], debug=True) wsgiref.handlers.CGIHandler().run(application) if __name__ == '__main__': main() ~ ~ "main.py" 16L, 402C

98. $ git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: main.py # # Changed but not updated: # (use "git add <file>..." to update what will be com # # modified: app.yaml # modified: main.py #

99. $ git status # On branch master # Changes to be committed: Staged # (use "git reset HEAD <file>..." to unstage) # # modified: main.py # # Changed but not updated: # (use "git add <file>..." to update what will be com # # modified: app.yaml # modified: main.py #

100. $ git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: main.py # # Changed but not updated: Unstaged # # (use "git add <file>..." to update what will be com # modified: app.yaml # modified: main.py #

101. $ git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: main.py # # Changed but not updated: # (use "git add <file>..." to update what will be com # # modified: app.yaml # modified: main.py #

102. Staged In Working Directory #!/usr/bin/env python #!/usr/bin/env python import wsgiref.handlers import wsgiref.handlers from google.appengine.ext import webapp from google.appengine.ext import webapp # this program prints out ‘hello world’ # this program prints out ‘hello world’ class MainHandler(webapp.RequestHandler): class MainHandler(webapp.RequestHandler): def get(self): def get(self): self.response.out.write('Hello World!') self.response.out.write('Hola Mundo!') def main(): def main(): application = webapp.WSGIApplication application = webapp.WSGIApplication ([('/' ([('/' debug=True) debug=True) wsgiref.handlers.CGIHandler().run wsgiref.handlers.CGIHandler().run (applicat (applicat if __name__ == '__main__': if __name__ == '__main__': main() main()

103. Staged In Working Directory #!/usr/bin/env python #!/usr/bin/env python import wsgiref.handlers import wsgiref.handlers from google.appengine.ext import webapp from google.appengine.ext import webapp # this program prints out ‘hello world’ # this program prints out ‘hello world’ class MainHandler(webapp.RequestHandler): class MainHandler(webapp.RequestHandler): def get(self): def get(self): self.response.out.write('Hello World!') self.response.out.write('Hola Mundo!') def main(): def main(): application = webapp.WSGIApplication application = webapp.WSGIApplication ([('/' ([('/' debug=True) debug=True) wsgiref.handlers.CGIHandler().run wsgiref.handlers.CGIHandler().run (applicat (applicat if __name__ == '__main__': if __name__ == '__main__': main() main()

104. You have to stage a ﬁle after you edit it

107. $ git add app.yaml main.py $ git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: app.yaml # modified: main.py #

109. git commit

112. $ git commit # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: app.yaml # modified: main.py # ~ ~ ~ ~ ".git/COMMIT_EDITMSG" 10L, 279C

113. $ git commit descriptive commit message # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: app.yaml # modified: main.py # ~ ~ ~ ~ ".git/COMMIT_EDITMSG" 10L, 279C

114. $ git commit descriptive commit message # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: app.yaml # modified: main.py # ~ ~ ~ ~ ".git/COMMIT_EDITMSG" 10L, 279C

115. $ git commit Created commit 77d3001: descriptive commit message 2 files changed, 4 insertions(+), 2 deletions(-)

116. A Basic Workflow Edit files vim / emacs / etc Stage the changes git add (file) Review your changes repo status Commit the changes git commit

119. A Basic Workflow Edit files vim / emacs / etc Stage the changes git add (file) Review your changes git status Commit the changes git commit

120. A Basic Workflow Edit files vim / emacs / etc Stage the changes git add (file) Review your changes git status Commit the changes git commit

121. A Basicer Workﬂow Edit ﬁles vim / emacs / etc Stage and Commit git commit -a

122. What’s going on here?

125. 77d3001

126. 77d3001a1de6bf8f5e431972fe4d25b01e595c0b

127. 77d3001a1de6bf8f5e431972fe4d25b01e595c0b

128. 77d3001a1de6bf8f5e431972fe4d25b01e595c0b ae668.. commit size tree c4ec5 parent a149e author Scott committer Scott my commit message goes here and it is really, really cool

129. 77d3001a1de6bf8f5e431972fe4d25b01e595c0b ae668.. commit size tree c4ec543b0322744e55c5efc9b6c4e449d398dbff parent a149e2160b3f7573768cdc2fce24d0881f3577e1 tree c4ec5 author Scott Chacon <[email protected]> 1223402504 -0700 committer Scott Chaconparent <[email protected]> 1223402504 -0700 a149e author Scott descriptive commit message committer Scott my commit message goes here and it is really, really cool

130. 77d3001a1de6bf8f5e431972fe4d25b01e595c0b ae668.. commit size tree c4ec5 parent a149e author Scott committer Scott my commit message goes here and it is really, really cool

131. 77d3001a1de6bf8f5e431972fe4d25b01e595c0b ae668.. commit size tree c4ec5 parent a149e author Scott committer Scott my commit message goes here and it is really, really cool ./ c4e app.yaml 3d5 index.yaml 1d3 main.py 03e

132. ae668.. commit size commit size tree 2de54 tree c4ec5 parent 38def parent a149e author Scott author Scott committer Scott this is the previous commit committer Scott and I am very proud of it my commit message goes here and it is really, really cool ./ c4e app.yaml 3d5 index.yaml 1d3 main.py 03e

133. ae668.. commit size commit size tree 2de54 tree c4ec5 parent 38def parent a149e author Scott author Scott committer Scott this is the previous commit committer Scott and I am very proud of it my commit message goes here and it is really, really cool ./ c4e app.yaml 3d5 index.yaml 1d3 ./ c4e main.py 03e app.yaml 3d5 index.yaml 1d3 main.py 03e

134. ae668.. commit size commit size commit size commit size tree 2de54 tree c4ec5 tree 2fe65 tree parent author 2fe65 90ecd parent 90ecd parent 38def parent a149e Scott author Scott author author committer Scott committer Scott this is the commit before that and I'm not sure why Scott Scott this is the commit before that and I'm not sure why committer Scott this is the previous commit committer Scott and I am very proud of it ./ c4e app.yaml 3d5 my commit message goes here ./ c4e index.yaml 1d3 and it is really, really cool app.yaml 3d5 main.py 03e index.yaml 1d3 ./ c4e main.py 03e app.yaml 3d5 index.yaml 1d3 ./ c4e main.py 03e app.yaml 3d5 index.yaml 1d3 main.py 03e

135. ae668.. commit size commit size commit size commit size tree 2de54 tree c4ec5 tree 2fe65 tree parent author 48e 2fe65 90ecd parent 38d 90ecd parent a14 38def parent 77d a149e Scott author Scott author author committer Scott committer Scott this is the commit before that and I'm not sure why Scott Scott this is the commit before that and I'm not sure why committer Scott this is the previous commit committer Scott and I am very proud of it ./ c4e 3d5 my commit message goes here 32a app.yaml c4e ./ index.yaml 1d3 and it is really, really cool app.yaml 3d5 main.py 03e index.yaml 5b1 1d3 c4e ./ f46 main.py 03e app.yaml 23f 3d5 index.yaml 30e 1d3 ./ c4e main.py 67e 03e app.yaml 3d5 index.yaml 1d3 main.py 03e 03e

136. Repository 5b1 32a c36 1d3 f46 3d4 ffe 6fe ae6 38d 23f 03e 254 30e 5b1 a14 67e 1d3 3d5 735 d23 c4e c4e 48e 77d de3 2d3

137. Repository 5b1 32a c36 1d3 f46 3d4 ffe 6fe ae6 git checkout ae635 38d 23f 03e 254 30e 5b1 a14 67e 1d3 3d5 735 d23 c4e c4e 48e 77d de3 2d3

138. Repository 5b1 32a c36 1d3 f46 3d4 ffe 6fe ae6 git checkout ae635 38d 23f 03e 254 30e 5b1 a14 67e 1d3 3d5 735 d23 c4e c4e 48e 77d de3 2d3

139. Repository Index Working Directory 5b1 32a c36 ./ 3d4 ./ 1d3 f46 3d4 ffe 6fe ae6 ./Rakeﬁle 1d3 Rakeﬁle 38d 23f 03e ./README 03e README 254 30e 5b1 a14 67e 1d3 ./lib/ c36 lib/ 3d5 735 d23 c4e c4e 48e ./lib/simplegit.rb 5b1 simplegit.rb 77d de3 2d3

143. Repository Index Working Directory 5b1 32a c36 ./ 3d4 ./ 1d3 f46 3d4 ffe 6fe ae6 ./Rakeﬁle 1d3 Rakeﬁle 38d 23f 03e ./README 03e README 254 30e 5b1 a14 67e 1d3 ./lib/ c36 lib/ 3d5 735 d23 c4e c4e 48e ./lib/simplegit.rb 5b1 simplegit.rb 77d de3 2d3 git add

144. Repository Index Working Directory 5b1 32a c36 ./ 3d4 ./ 1d3 f46 3d4 ffe 6fe ae6 ./Rakeﬁle 1d3 Rakeﬁle 34f 38d 23f 03e ./README 03e README 254 30e 5b1 a14 67e 1d3 ./lib/ c36 lib/ 3d5 735 d23 c4e c4e 48e ./lib/simplegit.rb 5b1 simplegit.rb 77d de3 2d3 git add

145. Repository Index Working Directory 5b1 32a c36 ./ 3d4 ./ 1d3 f46 3d4 ffe 6fe ae6 ./Rakeﬁle 1d3 34f Rakeﬁle 38d 23f 03e ./README 03e README 254 30e 5b1 a14 67e 1d3 ./lib/ c36 lib/ 3d5 735 d23 c4e c4e 48e ./lib/simplegit.rb 5b1 simplegit.rb 77d de3 2d3 34f 3da a08 ae9 git commit

146. Repository Index Working Directory 5b1 32a c36 ./ 3d4 ./ 1d3 f46 3d4 ffe 6fe ae6 ./Rakeﬁle 1d3 34f Rakeﬁle 38d 23f 03e ./README 03e README 254 30e 5b1 a14 67e 1d3 ./lib/ c36 lib/ 3d5 735 d23 c4e c4e 48e ./lib/simplegit.rb 5b1 simplegit.rb 77d de3 2d3 34f 3da a08 ae9

147. Repository Index Working Directory 5b1 32a c36 ./ 3d4 ./ 1d3 f46 3d4 ffe 6fe ae6 ./Rakeﬁle 1d3 34f Rakeﬁle 38d 23f 03e ./README 03e README 254 30e 5b1 a14 67e 1d3 ./lib/ c36 lib/ 3d5 735 d23 c4e c4e 48e ./lib/simplegit.rb 5b1 simplegit.rb 77d de3 2d3 34f 3da a08 ae9

148. object model pointer to a commit } snapshot C1 directory list tree ﬁle contents blob

149. object model pointer to a commit } snapshot C1 directory list tree ﬁle contents blob

150. ref commit commit commit tree tree tree blob tree blob tree blob tree blob

151. Branching and Merging

152. branches

153. branches lightweight, movable pointers to a commit branch C1

154. branching

155. git branch

156. git checkout

157. HEAD default master experiment C0 C1 C2 C3

158. HEAD C4 default master experiment C3 C0 C5 C1 C2 experiment C3 git branch experiment

159. HEAD C4 default master experiment C3 C0 C5 C1 C2 experiment C3 git branch experiment

160. HEAD C4 default master experiment $ git branch C3 C0 C5 C1 * default experiment C2 experiment C3

161. HEAD C4 default master experiment $ git branch C3 C0 C5 C1 * default experiment C2 experiment C3

162. C4 default master experiment C3 C0 C5 C1 C2 experiment C3 HEAD git checkout experiment

163. T1 master default master experiment git commit C0 C4 C1 2 C3 C5 C2 C3 experiment HEAD

166. T1 master default master experiment git commit C1 C0 C1 C4 git commit C2 C3 C2 C5 C3 experiment HEAD

167. HEAD T1 default master git checkout default master experiment C1 C0 C1 C4 C2 C3 C2 C5 C3 experiment

168. HEAD T1 default master git checkout default master experiment C1 C0 C1 C4 C2 C3 C2 C5 C3 experiment

169. git commit T1 T1 master default master HEAD C1 C0 C1 C4 C4 C2 C3 C2 C5 C3 C5 experiment experiment

172. T1 default master C0 C1 C4 C2 C3 C5 git checkout experiment experiment git commit HEAD

173. what is a branch, really?

174. $ find .git/refs .git/refs .git/refs/heads .git/refs/heads/default .git/refs/heads/experiment

177. $ find .git/refs .git/refs .git/refs/heads .git/refs/heads/default .git/refs/heads/experiment $ cat .git/refs/heads/default 6370409dc9e38af91565082bdf93577ff555489e

178. $ find .git/refs .git/refs .git/refs/heads .git/refs/heads/default .git/refs/heads/experiment $ cat .git/refs/heads/default 6370409dc9e38af91565082bdf93577ff555489e $ cat .git/refs/heads/experiment 33ce13c2f0ed35775956f81191b01a644448dcfc

179. $ cat .git/HEAD ref: refs/heads/experiment

182. merging

183. git merge

184. T1 default master C0 C1 C4 C2 C3 C5 experiment HEAD

185. HEAD T1 default master C0 C1 C4 C2 C3 C5 git checkout default experiment

186. HEAD T1 master default C0 C1 C4 C6 C2 C3 C5 git checkout default experiment git merge experiment

187. HEAD T1 master default C0 C1 C4 C6 C2 C3 C5 git checkout default experiment git merge experiment

188. default C0 C1 C4 C6 C8 C2 C3 C5 C7 experiment git checkout experiment HEAD

189. default C0 C1 C4 C6 C8 C2 C3 C5 C7 experiment git commit HEAD

190. HEAD default C0 C1 C4 C6 C8 C2 C3 C5 C7 experiment git checkout default

191. HEAD default C0 C1 C4 C6 C8 C2 C3 C5 C7 experiment git merge experiment

192. Why is this cool?

193. non-linear development

194. • clone the code that is in production • create a branch for issue #53 (iss53) • work for 10 minutes • someone asks for a hotﬁx for issue #102 • checkout ‘production’ • create a branch (iss102) • ﬁx the issue • checkout ‘production’, merge ‘iss102’ • push ‘production’ • checkout ‘iss53’ and keep working

195. production origin/master C1 C0 git clone

196. production origin/master C1 iss53 C0 git checkout -b iss53

197. iss53 production C2 origin/master C1 C0 git commit

198. iss53 C3 production C2 origin/master C1 C0 git commit

199. iss53 C3 production C2 origin/master C1 iss102 C0 git checkout production git checkout -b iss102

200. iss53 C3 iss102 production C2 C4 origin/master C1 C0 git commit

201. iss53 production C3 iss102 C4 C2 origin/master C1 C0 git checkout production git merge iss102

202. iss53 production C3 origin/master C4 C2 C1 C0 git push

203. iss53 C5 production C3 origin/master C4 C2 C1 C0 git checkout iss53 git commit

204. iss53 C5 production C3 origin/master C4 iss53v2 C2 C1 C0 git checkout production git checkout -b iss53v2

205. iss53v2 iss53 C5 C7 production C3 C6 origin/master C4 C2 C1 C0 git commit git commit

206. try out an idea

207. isolate work units

208. long running topics

209. all local, so far

210. Remotes

211. sharing git

229. git clone git://github.com/schacon/simplegit2.git

230. distributed workﬂow

231. distributed workﬂow fetch, pull and push

232. fetch

239. pull

240. pull = fetch + merge

241. push

245. git push

247. a who in the what now?

248. local repo public repo public repo internet local repo A B C

249. local repo public repo public repo A B C internet git push (ssh) local repo A B C

250. local repo git fetch A B C (git) public repo public repo A B C internet git push (ssh) local repo A B C

251. local repo git fetch A B C (git) D E F git commit public repo public repo A B C internet git push (ssh) local repo A B C

252. local repo git fetch A B C git push (git) D E F (ssh) public repo public repo A B C A B C internet D E F git push (ssh) local repo A B C

253. local repo git fetch A B C git push (git) D E F (ssh) public repo public repo A B C A B C internet D E F git push git fetch (ssh) (http) local repo A B C D E F

254. local repo git fetch A B C git push (git) D E F (ssh) public repo public repo A B C A B C internet D E F D E F git push git fetch (ssh) (http) local repo A B C D E F

255. multiple remotes

256. developer developer nick jessica ce0 4a7 5ec master my repo e4a

257. developer developer nick jessica commit ce0 4a7 5ec master my repo e4a

258. developer developer nick jessica tree ce0 4a7 5ec master my repo e4a

259. developer developer nick jessica blobs ce0 4a7 5ec master my repo e4a

260. developer developer nick jessica ce0 4a7 5ec schacon/ e4a project "public" git push public ce0 4a7 5ec master my repo e4a public/master

261. ce0 4a7 5ec developer developer e4a nick jessica git clone (url) ce0 4a7 5ec schacon/ e4a project "public" ce0 4a7 5ec master my repo e4a public/master

262. ce0 4a7 5ec developer developer e4a nick jessica 24f ec5 c12 git commit ce0 4a7 5ec schacon/ e4a project "public" ce0 4a7 5ec master my repo e4a public/master

263. ce0 4a7 5ec ce0 4a7 5ec developer developer e4a e4a nick 24f ec5 c12 git clone (url) jessica ce0 4a7 5ec schacon/ e4a project "public" ce0 4a7 5ec master my repo e4a public/master

264. ce0 4a7 5ec ce0 4a7 5ec developer developer e4a e4a nick jessica 24f ec5 c12 4ea df7 2fb git commit a09 ce0 4a7 5ec schacon/ e4a project "public" ce0 4a7 5ec master my repo e4a public/master

265. ce0 4a7 5ec ce0 4a7 5ec developer developer e4a e4a nick jessica 24f ec5 c12 4ea df7 2fb git push a09 ce0 4a7 5ec ce0 4a7 5ec ce0 4a7 5ec nickh/ schacon/ jessica/ e4a e4a e4a project project project 24f ec5 c12 4ea df7 2fb "public" a09 ce0 4a7 5ec master my repo e4a public/master

266. ce0 4a7 5ec ce0 4a7 5ec developer developer e4a e4a nick jessica 24f ec5 c12 4ea df7 2fb a09 ce0 4a7 5ec ce0 4a7 5ec ce0 4a7 5ec nickh/ schacon/ jessica/ e4a e4a e4a project project project 24f ec5 c12 4ea df7 2fb "nick" "public" a09 ce0 4a7 5ec master my repo e4a public/master git remote add nicknick git://github.com/nickh/project.git git remote add git://github.com/nickh/project.git

267. ce0 4a7 5ec ce0 4a7 5ec developer developer e4a e4a nick jessica 24f ec5 c12 4ea df7 2fb a09 ce0 4a7 5ec ce0 4a7 5ec ce0 4a7 5ec nickh/ schacon/ jessica/ e4a e4a e4a project project project 24f ec5 c12 4ea df7 2fb “nick” "nick" "public" a09 ce0 4a7 5ec master my repo e4a public/master git remote add nicknick git://github.com/nickh/project.git git remote add git://github.com/nickh/project.git

268. ce0 4a7 5ec ce0 4a7 5ec developer developer e4a e4a nick jessica 24f ec5 c12 4ea df7 2fb a09 ce0 4a7 5ec ce0 4a7 5ec ce0 4a7 5ec nickh/ schacon/ jessica/ e4a e4a e4a project project project 24f ec5 c12 4ea df7 2fb "nick" "public" "jess" a09 ce0 4a7 5ec master my repo e4a public/master git remote add add jess git://github.com/jessica/project.git git remote jess git://github.com/jessica/project.git

269. ce0 4a7 5ec ce0 4a7 5ec developer developer e4a e4a nick jessica 24f ec5 c12 4ea df7 2fb a09 ce0 4a7 5ec ce0 4a7 5ec ce0 4a7 5ec nickh/ schacon/ jessica/ e4a e4a e4a project project project 24f ec5 c12 4ea df7 2fb "nick" "public" “jess” "jess" a09 ce0 4a7 5ec master my repo e4a public/master git remote add add jess git://github.com/jessica/project.git git remote jess git://github.com/jessica/project.git

270. 5ec ce0 4a7 5ec ce0 4a7 5ec schacon/ jessica/ e4a e4a project ce0 4a7 5ec project ce0 4a7 5ec c12 developer 4ea df7 2fb developer e4a e4a "public" nick "jess" a09 jessica 24f ec5 c12 4ea df7 2fb a09 ce0 4a7 5ec master ce0 4a7 5ec ce0 4a7 5ec nickh/ schacon/ jessica/ my repo e4a public/master e4a e4a project project project 24f ec5 c12 nick/master 4ea df7 2fb "nick" "public" "jess" a09 git fetch nick ce0 4a7 5ec master my repo e4a public/master git fetch nick git remote add jess git://github.com/jessica/project.git

271. ce0 4a7 5ec ce0 4a7 5ec developer developer e4a e4a nick jessica 24f ec5 c12 4ea df7 2fb a09 ce0 4a7 5ec ce0 4a7 5ec ce0 4a7 5ec nickh/ schacon/ jessica/ e4a e4a e4a project project project 24f ec5 c12 4ea df7 2fb "nick" "public" "jess" a09 ce0 4a7 5ec master my repo e4a public/master 24f ec5 c12 nick/master git fetch nick

272. nickh/ schacon/ jessic e4a e4a project project proje 24f ec5 c12 ce0 4a7 5ec ce0 4a7 5ec developer "nick" "public" developer "jess e4a e4a nick jessica 24f ec5 c12 4ea df7 2fb a09 ce0 4a7 5ec master ce0 4a7 5ec ce0 4a7 5ec my repo e4a ce0 4a7 5ec public/ nickh/ schacon/ jessica/ e4a e4a 24f e4a ec5 c12 nick/ma project project project 24f ec5 c12 4ea 4ea df7 df7 2fb 2fb jess/ma "nick" "public" "jess" a09 a09 git fetch jess ce0 4a7 5ec master master my repo e4a public/master public/master 24f ec5 c12 nick/master git fetchnick git fetch jess git remote add jess git://github.com/jessica/project.git

273. ce0 4a7 5ec ce0 4a7 5ec developer developer e4a e4a nick jessica 24f ec5 c12 4ea df7 2fb a09 ce0 4a7 5ec ce0 4a7 5ec ce0 4a7 5ec nickh/ schacon/ jessica/ e4a e4a e4a project project project 24f ec5 c12 4ea df7 2fb "nick" "public" "jess" a09 ce0 4a7 5ec master my repo e4a public/master 24f ec5 c12 nick/master 4ea df7 2fb jess/master a09 git fetch jess

274. ce0 4a7 5ec ce0 4a7 5ec developer developer e4a e4a nick jessica 24f ec5 c12 4ea df7 2fb a09 ce0 4a7 5ec ce0 4a7 5ec ce0 4a7 5ec nickh/ schacon/ jessica/ e4a e4a e4a project project project 24f ec5 c12 4ea df7 2fb "nick" "public" "jess" a09 ce0 4a7 5ec my repo e4a public/master 24f ec5 c12 nick/master 4ea df7 2fb jess/master a09 c63 b3b master git merge nick jess

275. ce0 4a7 5ec ce0 4a7 5ec developer developer e4a e4a nick jessica 24f ec5 c12 4ea df7 2fb a09 ce0 4a7 5ec ce0 4a7 5ec ce0 4a7 5ec nickh/ schacon/ jessica/ e4a e4a e4a project project project 24f ec5 c12 24f ec5 c12 4ea df7 2fb "nick" "public" 4ea df7 2fb "jess" a09 a09 c63 b3b ce0 4a7 5ec my repo e4a 24f ec5 c12 nick/master 4ea df7 2fb jess/master a09 c63 b3b master public/master git push public

276. ce0 4a7 5ec ce0 4a7 5ec developer developer e4a e4a nick jessica 24f ec5 c12 4ea df7 2fb a09 ce0 4a7 5ec ce0 4a7 5ec ce0 4a7 5ec nickh/ schacon/ jessica/ e4a e4a e4a project project project 24f ec5 c12 24f ec5 c12 4ea df7 2fb "nick" "public" 4ea df7 2fb "jess" a09 a09 c63 b3b ce0 4a7 5ec my repo e4a 24f ec5 c12 nick/master 4ea df7 2fb jess/master a09 c63 b3b master public/master

280. popular workﬂows

281. central repository model

282. developer developer developer developer shared repository developer developer developer developer

283. shared repository developer developer developer git clone

284. shared repository developer developer developer git push

286. shared repository developer developer developer

287. shared repository developer developer developer git fetch git merge

289. dictator and lieutenants model

290. dictator blessed repository lieutenant lieutenant developer developer developer developer

291. dictator blessed repository lieutenant lieutenant developer developer developer developer git clone

292. dictator blessed repository lieutenant lieutenant developer developer developer developer git fetch git merge

293. dictator blessed repository lieutenant lieutenant developer developer developer developer git fetch git merge

294. git fetch; git merge dictator blessed repository lieutenant lieutenant developer developer developer developer

295. git push dictator blessed repository lieutenant lieutenant developer developer developer developer

296. dictator blessed repository lieutenant lieutenant developer developer developer developer git fetch

297. integration manager model

298. blessed repository developer developer public public integration developer developer manager private private

299. github.com /schacon/ticgit blessed /yob/ticgit /pope/ticgit repository developer developer public public integration developer developer manager private private

300. github.com /schacon/ticgit “forks” blessed /yob/ticgit /pope/ticgit repository developer developer public public integration developer developer manager private private

301. blessed repository developer developer public public integration developer developer manager private private git push

302. blessed repository developer developer public public integration developer developer manager private private git clone

304. blessed repository developer developer public public integration developer developer manager private private git fetch git merge

306. blessed repository developer developer public public integration developer developer manager private private git fetch git merge

308. Remotes Are Branches

309. scott jessica default C1 C0

310. scott jessica default scott/default default C1 C1 C0 C0

311. scott jessica default git clone scott/default default C1 C1 C0 C0

314. scott jessica default C4 C3 default scott/default C2 C1 C1 C0 C0

317. scott jessica default default C7 C4 C6 C3 C5 scott/default C2 C1 C1 C0 C0

318. scott jessica default default C7 C4 C6 C3 C5 scott/default C2 C1 C1 C0 C0

319. scott jessica default scott/default default C7 C7 C4 C6 C6 C3 C5 C5 C2 C1 C1 C0 C0

320. scott jessica default scott/default default experiment C7 C7 C4 C9 C6 C6 C3 C8 C5 C5 C2 C1 C1 C0 C0

322. scott jessica default scott/default default experiment C7 C7 C4 C9 git merge experiment C6 C6 C3 C8 C5 git merge scott/default C5 C2 C1 C1 C0 C0

324. scott jessica default scott/default default experiment C7 C7 C4 C9 C6 a “remote” branch isC3 C6 simply a C8 local pointer to the last known C5 state of another repository C5 C2 C1 C1 C0 C0

325. Tagging

326. lightweight tags

327. HEAD master 98ca9 34ac2 f30ab Snapshot A Snapshot B Snapshot C

328. git tag v1.0

329. HEAD v1.0 master 98ca9 34ac2 f30ab Snapshot A Snapshot B Snapshot C

330. HEAD v1.0 master 98ca9 34ac2 f30ab a38d3 Snapshot A Snapshot B Snapshot C Snapshot D

331. annotated tags

332. git tag -a v1.1 34ac2

333. 49e11.. tag size object ae668 type commit tagger Scott tag v1.3 my tag message that explains this tag

334. v1.1 HEAD tag data v1.0 master 98ca9 34ac2 f30ab a38d3 Snapshot A Snapshot B Snapshot C Snapshot D

335. Changes

339. git diff

341. What is not yet staged?

342. git diff

343. git diff working directory index repository

344. What is staged?

345. git diff --cached

346. git diff --cached working directory index repository

347. Uniﬁed Diff

348. git diff > change.patch

349. git diff > change.patch patch -p1 < change.patch

350. git diff > change.patch patch -p1 < change.patch or git apply change.patch

351. History

352. git log

361. What am I about to submit?

362. git log [branch]..

363. git log origin/master..

364. git log origin/master.. what you’ve committed that isn’t pushed yet

365. Stashing

366. when a commit is too much

367. $ git status # On branch iss53 # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: src/com/android/alarmclock/AlarmAlert.java # modified: src/com/android/alarmclock/AlarmAlertWakeLock.java # no changes added to commit (use "git add" and/or "git commit -a") $ git stash Saved working directory and index state "WIP on iss53: c8208f9... Merge branch 'cupcake'" HEAD is now at c8208f9 Merge branch 'cupcake' (To restore them type "git stash apply") $ git status # On branch iss53 nothing to commit (working directory clean)

376. $ git stash list stash@{0}: WIP on iss53: c8208f9... Merge branch 'cupcake' $ git stash apply # On branch iss53 # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: src/com/android/alarmclock/AlarmAlert.java # modified: src/com/android/alarmclock/AlarmAlertWakeLock.java # no changes added to commit (use "git add" and/or "git commit -a") $ git stash list stash@{0}: WIP on iss53: c8208f9... Merge branch 'cupcake' $ git stash drop stash@{0} Dropped stash@{0} (e19b0e94032d0614f450238f91953fe5e7e454a8)

384. git stash save list drop pop apply

385. Bulk Staging

386. working directory index repository

387. working directory git add index repository

388. working directory git add git add git add index repository

390. git add -u

391. git commit -a

392. working directory index git commit -a repository

393. git commit -a git add -u git commit

394. Git Help

395. git [command] --help

396. git help [command]

397. git-scm.com

398. git-scm.com

406. that’s it!

407. merci

408. Resources • git-scm.com • progit.org Patricks Irish Pub • github.com 33, rue de Montreuil • #git / #github on IRC 8pm, tonight • gitcasts.com • [email protected]

409. git ninja training

410. Patch Staging

411. git add -p

412. $ git status # On branch master # Changed but not updated: # (use "git add <file>..." to update what wi # (use "git checkout -- <file>..." to discar # # modified: ticgit.gemspec # no changes added to commit (use "git add" and/

413. $ git status # On branch master # Changed but not updated: # (use "git add <file>..." to update what wi # (use "git checkout -- <file>..." to discar # # modified: ticgit.gemspec # no changes added to commit (use "git add" and/

414. $ git add -p diff --git a/ticgit.gemspec b/ticgit.gemspec index 9c32bd4..a44667b 100644 --- a/ticgit.gemspec +++ b/ticgit.gemspec @@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY s.name = "ticgit" - s.version = "0.3.5" + s.version = "0.3.6" s.date = "2008-05-10" s.author = "Scott Chacon" s.email = "[email protected]" Stage this hunk [y,n,a,d,/,j,J,g,e,?]? y

416. $ git add -p diff --git a/ticgit.gemspec b/ticgit.gemspec index 9c32bd4..a44667b 100644 --- a/ticgit.gemspec +++ b/ticgit.gemspec @@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY s.name = "ticgit" - s.version = "0.3.5" + s.version = "0.3.6" s.date = "2008-05-10" s.author = "Scott Chacon" s.email = "[email protected]" Stage this hunk [y,n,a,d,/,j,J,g,e,?]?

418. @@ -9,9 +9,10 @@ Gem::Specification.new do |s| s.files = ["lib/ticgit/base.rb", "lib/ticgit/ "lib/ticgit/comment.rb", "lib/ticgit/ticket.rb", "lib/ ticgit.rb", "bin/ti", "bin/ticgitweb"] s.bindir = 'bin' - s.executables << "ti" - s.executables << "ticgitweb" + s.executables = ["ti", "ticgitweb"] + s.default_executable = %q{ti} s.homepage = "http://github/schacon/ticgit" s.require_paths = ["lib", "bin"] + s.specification_version = 2 if s.respond_to? :specification_version= end Stage this hunk [y,n,a,d,/,K,g,s,e,?]?

419. @@ -9,9 +9,10 @@ Gem::Specification.new do |s| s.files = ["lib/ticgit/base.rb", "lib/ticgit/ "lib/ticgit/comment.rb", "lib/ticgit/ticket.rb", "lib/ ticgit.rb", "bin/ti", "bin/ticgitweb"] s.bindir = 'bin' - s.executables << "ti" - s.executables << "ticgitweb" + s.executables = ["ti", "ticgitweb"] + s.default_executable = %q{ti} s.homepage = "http://github/schacon/ticgit" s.require_paths = ["lib", "bin"] + s.specification_version = 2 if s.respond_to? :specification_version= end Stage this hunk [y,n,a,d,/,K,g,s,e,?]?

420. @@ -9,9 +9,10 @@ Gem::Specification.new do |s| s.files = ["lib/ticgit/base.rb", "lib/ticgit/ "lib/ticgit/comment.rb", "lib/ticgit/ticket.rb", "lib/ ticgit.rb", "bin/ti", "bin/ticgitweb"] s.bindir = 'bin' - s.executables << "ti" - s.executables << "ticgitweb" + s.executables = ["ti", "ticgitweb"] + s.default_executable = %q{ti} s.homepage = "http://github/schacon/ticgit" s.require_paths = ["lib", "bin"] + s.specification_version = 2 if s.respond_to? :specification_version= end Stage this hunk [y,n,a,d,/,K,g,s,e,?]? n

421. $ git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: ticgit.gemspec # # Changed but not updated: # (use "git add <file>..." to update what will be com # (use "git checkout -- <file>..." to discard changes # # modified: ticgit.gemspec #

425. partially stage ﬁles

426. git add -p

427. Annotation

428. git blame

429. git blame ie: “what dumbass did this? oh, it was me...”

430. git blame daemon.c 979e32fa (Randal L. Schwartz 2005-10-25 16:29:09 -0700 1) #include "cache.h" 85023577 (Junio C Hamano 2006-12-19 14:34:12 -0800 2) #include "pkt-line.h" 77cb17e9 (Michal Ostrowski 2006-01-10 21:12:17 -0500 3) #include "exec_cmd.h" 49ba83fb (Jon Loeliger 2006-09-19 20:31:51 -0500 4) #include "interpolate.h" f8ff0c06 (Petr Baudis 2005-09-22 11:25:28 +0200 5) 85023577 (Junio C Hamano 2006-12-19 14:34:12 -0800 6) #include <syslog.h> 85023577 (Junio C Hamano 2006-12-19 14:34:12 -0800 7) 695dffe2 (Johannes Schindelin 2006-09-28 12:00:35 +0200 8) #ifndef HOST_NAME_MAX 695dffe2 (Johannes Schindelin 2006-09-28 12:00:35 +0200 9) #define HOST_NAME_MAX 256 695dffe2 (Johannes Schindelin 2006-09-28 12:00:35 +0200 10) #endif 695dffe2 (Johannes Schindelin 2006-09-28 12:00:35 +0200 11) 415e7b87 (Patrick Welche 2007-10-18 18:17:39 +0100 12) #ifndef NI_MAXSERV 415e7b87 (Patrick Welche 2007-10-18 18:17:39 +0100 13) #define NI_MAXSERV 32 415e7b87 (Patrick Welche 2007-10-18 18:17:39 +0100 14) #endif 415e7b87 (Patrick Welche 2007-10-18 18:17:39 +0100 15) 9048fe1c (Petr Baudis 2005-09-24 16:13:01 +0200 16) static int log_syslog; f8ff0c06 (Petr Baudis 2005-09-22 11:25:28 +0200 17) static int verbose; 1955fabf (Mark Wooding 2006-02-03 20:27:04 +0000 18) static int reuseaddr; f8ff0c06 (Petr Baudis 2005-09-22 11:25:28 +0200 19) 960deccb (H. Peter Anvin 2005-10-19 14:27:01 -0700 20) static const char daemon_usage[] = 1b1dd23f (Stephan Beyer 2008-07-13 15:36:15 +0200 21) "git daemon [--verbose] [--syslog] [ 3bd62c21 (Stephen R. van den Berg 2008-08-14 20:02:20 +0200 22) " [--timeout=n] [--init-ti 3bd62c21 (Stephen R. van den Berg 2008-08-14 20:02:20 +0200 23) " [--strict-paths] [--base 73a7a656 (Jens Axboe 2007-07-27 14:00:29 -0700 24) " [--user-path | --user-pa 49ba83fb (Jon Loeliger 2006-09-19 20:31:51 -0500 25) " [--interpolated-path=pat 678dac6b (Tilman Sauerbeck 2006-08-22 19:37:41 +0200 26) " [--reuseaddr] [--detach] d9edcbd6 (Junio C Hamano 2006-09-07 01:40:04 -0700 27) " [--[enable|disable|allow dd467629 (Jon Loeliger 2006-09-26 09:47:43 -0500 28) " [--inetd | [--listen=hos dd467629 (Jon Loeliger 2006-09-26 09:47:43 -0500 29) " [--user=user dd467629 (Jon Loeliger 2006-09-26 09:47:43 -0500 30) " [directory...]"; 4ae95682 (H. Peter Anvin 2005-09-26 19:10:55 -0700 31) 4ae95682 (H. Peter Anvin 2005-09-26 19:10:55 -0700 32) /* List of acceptable pathname prefi 96f1e58f (David Rientjes 2006-08-15 10:23:48 -0700 33) static char **ok_paths;

436. git blame -C GITPackUpload.m

437. git blame -C GITPackUpload.m f344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 12) f344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 13) #define PACK_SIGN f344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 14) #define PACK_VERS f344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 15) ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 16) @implementation G ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 17) ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 18) @synthesize gitRe ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 19) @synthesize needR ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 20) @synthesize gitSo ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 21) @synthesize refDi ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 22) a2cbabf5 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-25 22:29:39 +0100 23) - (id) initWithGi ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 24) { a2cbabf5 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-25 22:29:39 +0100 25) gitRepo = ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 26) needRefs = ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 27) gitSocket ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 28) return sel ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 29) } ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 30) ad11ac80 Source/Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 +0100 31) - (bool) uploadPa f344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 32) { f344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 33) NSLog(@"up f344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 34) NSString * f344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 35) NSArray *t f344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 36) 56ef2caf Source/Network/GITServerHandler.m (Scott Chacon 2009-01-05 21:44:26 -0800 37) refDict = f344f58d Source/Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 -0800 38)

440. Bisecting

441. binary search for where a bug was introduced

442. $ git bisect start $ git bisect bad $ git bisect good 3acb4c2c6666ed6cb91cb0b983efe9d50cf8cfbe Bisecting: 6 revisions left to test after this [ecb6e1bc347ccecc5f9350d878ce677feb13d3b2] error handling on repo $ git bisect good Bisecting: 3 revisions left to test after this [b047b02ea83310a70fd603dc8cd7a6cd13d15c04] secure this thing $ git bisect bad Bisecting: 1 revisions left to test after this [f71ce38690acf49c1f3c9bea38e09d82a5ce6014] drop exceptions table and $ git bisect good b047b02ea83310a70fd603dc8cd7a6cd13d15c04 is first bad commit commit b047b02ea83310a70fd603dc8cd7a6cd13d15c04 Author: PJ Hyett <[email protected]> Date: Tue Jan 27 14:48:32 2009 -0800 secure this thing :040000 040000 40ee3e7821b895e52c1695092db9bdc4c61d1730 f24d3c6ebcfc639b1a3814550e62d60b8e68a8e4 M config

449. $ git bisect start $ git bisect bad $ git bisect good 3acb4c2c6666ed6cb91cb0b983efe9d50cf8cfbe Bisecting: 6 revisions left to test after this [ecb6e1bc347ccecc5f9350d878ce677feb13d3b2] error handling on repo $ git bisect good Bisecting: 3 revisions left to test after this [b047b02ea83310a70fd603dc8cd7a6cd13d15c04] secure this thing $ git bisect bad Bisecting: 1 revisions left to test after this [f71ce38690acf49c1f3c9bea38e09d82a5ce6014] drop exceptions table $ git bisect good b047b02ea83310a70fd603dc8cd7a6cd13d15c04 is first bad commit commit b047b02ea83310a70fd603dc8cd7a6cd13d15c04 Author: PJ Hyett <[email protected]> Date: Tue Jan 27 14:48:32 2009 -0800 secure this thing :040000 040000 40ee3e7821b895e52c1695092db9bdc4c61d1730 f24d3c6ebcfc639b1a3814550e62d60b8e68a8e4 M config

453. $ git bisect reset

454. no mas

Git 101 Presentation

More Related Content

What's hot (20)

Similar to Git 101 Presentation (11)

Git 101 Presentation