Git 101: An Introduction to Version Control with Git

1. Git 101 Scott Chacon

2. Introduction

4. Scott Chacon

6. git-scm.com

7. http://gitref.org

9. http://progit.org

10. schacon@gmail.com

11. @chacon twitter

12. </me>

13. What is Git?

14. “distributed version control system”

15. what is version control?

16. what is version control? what do we use it for?

17. imagine a world with no version control tools

19. what would you do?

20. downsides?

21. who doesn’t use version control?

22. who doesn’t use version control? rhetorical question

23. what project is this? • thousands of developers • working all across the world • used on millions of computers • runs 90% of the supercomputers in the world • runs my phone •11 years with no version control system • has an adorable mascot

25. 1991-2002

28. no version control

29. how did they do it?

30. main dude main.c library.c library.h

31. main dude main.c library.c library.h ver-1.0.zip

32. main dude main.c library.c library.h ver-1.0.zip you

33. main dude main.c library.c library.h ver-1.0.zip you

34. main dude main.c library.c library.h ver-1.0.zip you v1/main.c v1/library.c v1/library.h

35. main dude main.c library.c library.h ver-1.0.zip you v1/main.c v1/library.c v1/library.h cp -Rf v1 patch

36. main dude main.c library.c library.h ver-1.0.zip you v1/main.c v1/library.c v1/library.h cp -Rf v1 patch patch/main.c patch/library.c patch/library.h

37. main dude main.c library.c library.h ver-1.0.zip you v1/main.c v1/library.c v1/library.h cp -Rf v1 patch patch/main.c patch/library.c patch/library.h

38. main dude main.c library.c library.h ver-1.0.zip you v1/main.c v1/library.c v1/library.h cp -Rf v1 patch patch/main.c patch/library.c* patch/library.h diff -u v1 patch

39. main dude main.c library.c library.h ver-1.0.zip you v1/main.c v1/library.c v1/library.h cp -Rf v1 patch patch/main.c patch/library.c* patch/library.h diff -u v1 patch $ git diff v1 patch diff --git a/v1/library.c b/patch/library.c index 0be4b5f..0120580 100644 --- a/v1/library.c +++ b/patch/library.c @@ -19,7 +19,7 @@ static struct { { "detachedhead", &advice_detached_head }, }; -int git_default_config(const char *var, const char *value) +int YO_MOMMA_IS_FAT(const char *var, const char *value) { const char *k = skip_prefix(var, "advice."); int i;

40. main dude main.c library.c library.h ver-1.0.zip you v1/main.c v1/library.c v1/library.h cp -Rf v1 patch patch/main.c patch/library.c* patch/library.h diff -u v1 patch email

41. main dude main.c library.c library.h you v1/main.c v1/library.c v1/library.h cp -Rf v1 patch patch/main.c patch/library.c* patch/library.h diff -u v1 patch ver-1.0.zip ver-1.1.zip

42. ver-1.0.zip ver-1.1.zip ver-1.2.zip

43. now imagine...

44. main dude main.c library.c library.h V1

45. main dude main.c library.c library.h you V1 main.c library.c library.h V1

46. main dude main.c library.c library.h you V1 main.c library.c library.h V1 main.c library.c* library.h V2

47. main dude main.c library.c library.h you V1 main.c* library.c library.h V3 main.c library.c library.h V1 main.c library.c* library.h V2

48. main dude main.c library.c library.h you V1 main.c* library.c library.h V3 main.c library.c library.h V1 main.c library.c* library.h V2 main.c library.c* library.h V2

49. main dude main.c library.c library.h you V1 main.c* library.c library.h V3 main.c library.c library.h V1 main.c library.c* library.h V2 main.c library.c* library.h V2 main.c* library.c* library.h V4

53. Snapshots, not Patches

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

70. Basic Git

71. First Steps

72. $ git config --global user.name “Scott Chacon” $ git config --global user.email “schacon@gmail.com”

73. Getting a Repo

74. Create One

75. git init

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

86. Clone One

87. git clone

88. $ 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 $

91. $ 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 $

92. A Basic Workﬂow

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

94. working directory repository index git add git commit

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

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

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

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

100. #!/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 $ vim main.py

101. #!/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 $ vim main.py

102. $ git status

103. $ 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

106. $ 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 STAGED

108. git add

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

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

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

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

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

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

117. $ 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 #

118. $ 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

119. #!/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 $ vim main.py

120. #!/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 $ vim main.py

121. # 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 # $ git status

122. # 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 # $ git status Staged

123. # 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 # $ git status Unstaged

124. # 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 # $ git status

125. #!/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 ([('/' debug=True) wsgiref.handlers.CGIHandler().run (applicat if __name__ == '__main__': main() #!/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 ([('/' debug=True) wsgiref.handlers.CGIHandler().run (applicat if __name__ == '__main__': main() Staged In Working Directory

126. #!/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 ([('/' debug=True) wsgiref.handlers.CGIHandler().run (applicat if __name__ == '__main__': main() #!/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 ([('/' debug=True) wsgiref.handlers.CGIHandler().run (applicat if __name__ == '__main__': main() Staged In Working Directory

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

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

132. git commit

135. $ 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

136. 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 $ git commit

137. 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 $ git commit

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

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

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

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

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

145. What’s going on here?

148. 77d3001

149. 77d3001a1de6bf8f5e431972fe4d25b01e595c0b

150. 77d3001a1de6bf8f5e431972fe4d25b01e595c0b

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

152. 77d3001a1de6bf8f5e431972fe4d25b01e595c0b commit size ae668.. tree parent author committer my commit message goes here and it is really, really cool c4ec5 a149e Scott Scott tree c4ec543b0322744e55c5efc9b6c4e449d398dbff parent a149e2160b3f7573768cdc2fce24d0881f3577e1 author Scott Chacon <schacon@gmail.com> 1223402504 -0700 committer Scott Chacon <schacon@gmail.com> 1223402504 -0700 descriptive commit message

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

173. ref commit commitcommit tree treeblob tree treeblob tree treeblob blob

174. Bulk Staging

175. working directory repository index

176. working directory repository index git add

177. working directory repository index git add git add git add

179. git add -u

180. git commit -a

181. working directory repository git commit -aindex

182. git commit -a git add -u git commit

183. Patch Staging

184. git add -p

185. $ 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/

186. $ 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/

187. $ 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 = "schacon@gmail.com" Stage this hunk [y,n,a,d,/,j,J,g,e,?]? y

189. $ 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 = "schacon@gmail.com" Stage this hunk [y,n,a,d,/,j,J,g,e,?]?

191. @@ -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,?]?

192. @@ -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,?]?

193. @@ -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

194. $ 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 #

198. partially stage ﬁles

199. git add -p

200. Changes

204. git diff

206. What is not yet staged?

207. git diff

208. git diff working directory repository index

209. What is staged?

210. git diff --cached

211. git diff --cached working directory repository index

212. git diff --stat

213. $ git diff --stat kidgloves.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

214. Uniﬁed Diff

215. git diff > change.patch

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

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

218. History

219. git log

228. Branching and Merging

229. branches

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

231. branching

232. git branch

233. git checkout

234. C1 master C0 C2 C3 experiment HEAD default

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

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

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

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

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

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

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

244. C1 master C0 C2 C3 experiment C1 master C2 C3 C4 experiment C5 T1 HEAD git checkout defaultdefault

245. C1 master C0 C2 C3 experiment C1 master C2 C3 C4 experiment C5 T1 HEAD git checkout defaultdefault

246. C1 master C0 C2 C3 C4 experiment C5 T1 C1 master C2 C3 C4 experiment C5 T1git commit HEAD default

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

250. what is a branch, really?

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

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

255. $ 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

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

259. merging

260. git merge

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

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

263. C1C0 C2 C3 C4 experiment C5 C6 masterT1 git checkout default git merge experiment HEAD default

264. C1C0 C2 C3 C4 experiment C5 C6 masterT1 git checkout default git merge experiment HEAD default

265. C1C0 C2 C3 C4 C5 C6 C7 C8 default experiment HEADgit checkout experiment

266. C1C0 C2 C3 C4 C5 C6 C7 C8 default experiment HEADgit commit

267. C1C0 C2 C3 C4 C5 C6 C7 C8 default experiment HEAD git checkout default

268. C1C0 C2 C3 C4 C5 C6 C7 C8 default experiment HEAD git merge experiment

269. Why is this cool?

270. try out an idea

271. isolate work units

272. long running topics

273. visualizing your branches

274. git log --graph

275. git log --oneline --graph

276. gitk

277. gitk 6d13f..41aba

278. git log --all

279. Deleting Branches

280. git branch -d branch

281. git branch -D branch

282. Stashing

283. when a commit is too much

284. $ 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)

293. $ 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)

301. git stash branch new_branch stash@{1}

302. git stash save list drop pop apply branch

303. Remotes

304. sharing git

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

323. distributed workﬂow

324. distributed workﬂow fetch, pull and push

325. fetch

332. pull

333. pull = fetch + merge

334. push

338. git push

340. git push origin branchA:branchB

341. a who in the what now?

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

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

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

345. 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

346. 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

347. 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

348. 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 FD E F

349. multiple remotes

350. developer nick developer jessica my repo 5ec e4a 4a7ce0 master

351. developer nick developer jessica my repo 5ec e4a 4a7ce0 master commit

352. developer nick developer jessica my repo 5ec e4a 4a7ce0 master tree

353. developer nick developer jessica my repo 5ec e4a 4a7ce0 master blobs

354. schacon/ project developer nick developer jessica "public" my repo 5ec e4a 4a7ce0 master git push public public/master 5ec e4a 4a7ce0

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

356. schacon/ project developer jessica "public" my repo 5ec e4a 4a7ce0 master git commit public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f

357. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f git clone (url) 5ec e4a 4a7ce0 developer jessica

358. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git commit

359. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git push 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09

360. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git remote add nick git://github.com/nickh/project.git 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" git remote add nick git://github.com/nickh/project.git

361. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git remote add nick git://github.com/nickh/project.git 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick"“nick” git remote add nick git://github.com/nickh/project.git

362. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git remote add jess git://github.com/jessica/project.git 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" git remote add jess git://github.com/jessica/project.git

363. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git remote add jess git://github.com/jessica/project.git 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" git remote add jess git://github.com/jessica/project.git “jess”

364. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git remote add jess git://github.com/jessica/project.git 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 git fetch nick 5ec c12 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"jess" c12ec524f nick/master git fetch nick

365. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git fetch nick 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" c12ec524f nick/master

366. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git remote add jess git://github.com/jessica/project.git 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" git fetch jess schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/ e4a git fetch jess e4a nickh/ project c12ec524f jessic proje "nick" "jess ec524f nick/ma 2fbdf74ea a09 jess/ma c12 schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git fetch nick 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" c12ec524f nick/master

367. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git fetch jess 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" ec524f nick/master 2fbdf74ea a09 jess/master c12

368. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" ec524f nick/master 2fbdf74ea a09 jess/master c12 b3bc63 git merge nick jessgit merge nick/master jess/master

369. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git push public 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" ec524f nick/master 2fbdf74ea a09 jess/master c12 b3bc63 e4a ec524f 2fbdf74ea a09 c12 b3bc63

370. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" ec524f nick/master 2fbdf74ea a09 jess/master c12 b3bc63 e4a ec524f 2fbdf74ea a09 c12 b3bc63

374. Remotes Are Branches

375. C0 default scott jessica C1

376. C0 default scott jessica C1 C0 scott/default default C1

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

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

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

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

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

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

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

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

391. Tagging

392. lightweight tags

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

394. git tag v1.0

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

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

397. annotated tags

398. git tag -a v1.1 34ac2

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

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

401. tagging objects

402. git hash-object -w ﬁle.txt

403. $ git hash-object -w ~/README.txt 35a0dd3af166e09ac378dfeb95953923e71ea45b $ git tag -a my_readme 35a0dd3af166e09ac378dfe $ git show my_readme tag my_readme Tagger: Scott Chacon <schacon@gmail.com> Date: Tue Mar 16 08:36:24 2010 -0700 my readme My README File by Scott Chacon

406. sharing tags

407. git push --tags

408. Git Inspection

409. Revision Selection

410. Revision Selection alternate ways to refer to objects or ranges of objects

411. Revision Selection full sha-1 partial sha-1 branch or tag name caret parent tilde spec blob spec relative specs ranges

412. Full SHA1 6e453f523fa1da50ecb04431101112b3611c6a4d

413. Partial SHA1 6e453f523fa1da50ecb04431101112b3611c6a4d 6e453f523fa1da50 6e453

414. Branch, Remote or Tag Name v1.0 default m/cupcake

415. Caret Parent default^2 2nd parent of ‘default’

416. ce0e4 master 5ec47 2f45e 4eadf 2fbb3 18cae b3be1 a09c6 df2fa c36ae jess/master

417. ce0e4 master 5ec47 2f45e 4eadf 2fbb3 18cae b3be1 a09c6 df2fa c36ae jess/master master^

418. ce0e4 master 5ec47 2f45e 4eadf 2fbb3 18cae b3be1 a09c6 df2fa c36ae jess/master master^2

419. Tilde Spec default~2 grandparent of ‘default’ (parent of the parent)

420. ce0e4 master 5ec47 2f45e 4eadf 2fbb3 18cae b3be1 a09c6 df2fa c36ae jess/master master~2

421. ce0e4 master 5ec47 2f45e 4eadf 2fbb3 18cae b3be1 a09c6 df2fa c36ae jess/master master^^^2 master~2^2

424. Blob Spec default:path/to/file blob of that ﬁle in ‘default’ commit

425. Relative Specs master@{yesterday} the commit ‘master’ was at yesterday

426. Relative Specs master@{5} the 5th prior value of ‘master’ (locally)

427. Ranges ce0e4..e4272 every commit reachable by e4272 that is not reachable by ce034

428. Ranges [old]..[new] every commit reachable by [new] that is not reachable by [old]

429. Ranges ce0e4.. everything since a commit

430. ce0e4 master 5ec47 2f45e 4eadf 2fbb3 18cae b3be1 a09c6 df2fa c36ae jess/master jess/master..master

432. jess/master..master ce0e4 master 5ec47 2f45e 4eadf 2fbb3 18cae b3be1 a09c6 df2fa c36ae jess/master

434. ce0e4 master 5ec47 2f45e 4eadf 2fbb3 18cae b3be1 a09c6 df2fa c36ae jess/master jess/master..c36ae

438. Ranges ce0e4...e4272 every commit reachable by either but not commits reachable by both

439. ce0e4 master 5ec47 2f45e 4eadf 2fbb3 18cae b3be1 a09c6 df2fa c36ae jess/master jess/master...c36ae

443. Advanced Log

444. Log Subsets

445. git log m/cupcake..

446. C1 C0 m/cupcake default HEAD

447. C1 C0 C2 C3 default C4 m/cupcake HEAD

448. C1 C0 C2 C3 default C4 m/cupcake HEAD git log m/cupcake..

449. C1 C0 C2 C3 default C4 m/cupcake HEAD git log m/cupcake..HEAD

453. commit 72d404debaa804fca82fd9cf710fbde48c7305c6 Author: Shawn O. Pearce <spearce@spearce.org> Date: Sun Oct 12 13:13:59 2008 -0700 test-lib: fix broken printf b8eecafd888d219633f4c29e8b6a90fc21a46dfd introduced usage of printf without a format string. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> commit 969c877506cf8cc760c7b251fef6c5b6850bfc19 Author: Jeff King <peff@peff.net> Date: Sun Oct 12 00:06:11 2008 -0400 git apply --directory broken for new files We carefully verify that the input to git-apply is sane, including cross-checking that the filenames we see in "+++" headers match what was provided on the command line of "diff --git". When --directory is used, however, we ended up comparing the unadorned name to one with the prepended root, causing us to complain about a mismatch. We simply need to prepend the root directory, if any, when pulling the name out of the git header. commit ff74126c03a8dfd04e7533573a5c420f2a7112ac Author: Johannes Schindelin <Johannes.Schindelin@gmx.de> Date: Fri Oct 10 13:42:12 2008 +0200 rebase -i: do not fail when there is no commit to cherry-pick

454. commit 72d404debaa804fca82fd9cf710fbde48c7305c6 Author: Shawn O. Pearce <spearce@spearce.org> Date: Sun Oct 12 13:13:59 2008 -0700 test-lib: fix broken printf b8eecafd888d219633f4c29e8b6a90fc21a46dfd introduced usage of printf without a format string. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> commit 969c877506cf8cc760c7b251fef6c5b6850bfc19 Author: Jeff King <peff@peff.net> Date: Sun Oct 12 00:06:11 2008 -0400 git apply --directory broken for new files We carefully verify that the input to git-apply is sane, including cross-checking that the filenames we see in "+++" headers match what was provided on the command line of "diff --git". When --directory is used, however, we ended up comparing the unadorned name to one with the prepended root, causing us to complain about a mismatch. We simply need to prepend the root directory, if any, when pulling the name out of the git header. commit ff74126c03a8dfd04e7533573a5c420f2a7112ac Author: Johannes Schindelin <Johannes.Schindelin@gmx.de> Date: Fri Oct 10 13:42:12 2008 +0200 rebase -i: do not fail when there is no commit to cherry-pick C2 C3 C4

455. git log m/cupcake.. git log m/cupcake..HEAD git log HEAD ^m/cupcake git log 35ae2 ^9fe42

456. git log 3e45a ^573eb

457. git log 3e45a ^573eb

458. git log 08cb1 ca374 ^c0bf9

459. C1 C0 C2 C6 C7 C3 C4 C8 C9 C5 m/cupcake default experiment m/cupcake git log c5 c7 ^c9

460. C1 C0 C2 C6 C7 C3 C4 C8 C9 C5 m/cupcake default experiment m/cupcakem/cupcake default git log c5 c7 ^c9

461. C1 C0 C2 C6 C7 C3 C4 C8 C9 C5 m/cupcake default experiment m/cupcakem/cupcake default git log c5 c7 ^c9

462. C1 C0 C2 C6 C7 C3 C4 C8 C9 C5 m/cupcake default experiment m/cupcakem/cupcake git log c5 c7 ^c9

463. C1 C0 C2 C6 C7 C3 C4 C8 C9 C5 m/cupcake default experiment git log c5 c7 ^c9

464. which changes aren’t in experiment?

465. C1 C0 C2 C6 C7 C3 C4 C8 C9 C5 m/cupcake default experiment git log m/cupcake default ^experiment

472. Log Formatting

473. git log -p

479. git log -p

480. git log --pretty

487. git log --left-right

488. $ git log --pretty=oneline --left-right 5f7f801...77976b <5f7f801227868c7abcce7e58dee3eff855011955 convert file browser to html >77976b24ff839c59c3b20d80cb28351ccb5e59a8 remove cruft >09b76d2966e2370a78ed37a31c2f7c23d08609c3 git-log >7000b24511618a21d40b39ee213d397e1d29497d like i said >c2a6adfcd18c0d95dbed6ea62ac9c9a912d18123 create this on deploy >6ba3609953d5c46a76ca1d0d3d83018be61454e6 i am too meta for you <3dff6074fe205e36fae219f277ef87aab097e236 Merge branch 'master' into h <1cdc8437fa6c621d96c4dfa5f6370c8fdb9cbc3d Merge branch 'master' into h <20125a6d37d5c1614ffe1de94ca064095968e7f0 delete default images

492. git log --graph

493. git log --pretty=oneline --graph

494. gitk

495. gitk 6d13f..41aba

496. Merged Branches

497. git branch --merged

498. git branch --no-merged

499. Branch Diffs

500. git diff branch

501. diff --git a/Rakefile b/Rakefile index eb54561..2d2c777 100644 --- a/Rakefile +++ b/Rakefile @@ -17,10 +17,6 @@ Rake::GemPackageTask.new(spec) do |pkg| pkg.need_tar = true end -task :default => "pkg/#{spec.name}-#{spec.version}.gem" do - puts "generated latest version" -end - desc "Regenerate Documentation" task :doc do |t| system('rdoc lib/ README --main README --inline-source') diff --git a/TODO b/TODO deleted file mode 100644 index bbe7708..0000000 --- a/TODO +++ /dev/null @@ -1,7 +0,0 @@ -Git Functions: -* add

502. git diff --stat

503. $ git diff --stat branch1 Rakefile | 4 ---- TODO | 7 ------- lib/simple_git.rb | 48 ------------------------------------------- lib/simplegit.rb | 52 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 59 deletions(-)

504. git diff --name-only

505. $ git diff --name-only branch Rakefile TODO lib/simple_git.rb lib/simplegit.rb

506. git diff branch

507. git diff branch HEAD

508. git diff branch1 branch2

509. Revision Diffs

510. git diff revA revB

511. C1 C0 C2 C6 C7 C3 C4 C8 C9 C5 m/cupcake default experiment

512. C1 C0 C2 C6 C7 C3 C4 C8 C9 C5 m/cupcake default experiment git diff c6 c4

515. C1 C0 C2 C6 C7 C3 C4 C8 C9 C5 m/cupcake default experiment git diff c6 c4 this may not be what you want!

516. C1 C0 C2 C6 C7 C3 C4 C8 C9 C5 m/cupcake default experiment ./file1C1

517. C2 C1 C0 C2 C6 C7 C3 C4 C8 C9 C5 m/cupcake default experiment ./file1C1 ./file1 ./file2

518. C2 C1 C0 C2 C6 C7 C3 C4 C8 C9 C5 m/cupcake default experiment ./file1C1 ./file1 ./file2 C3 ./file1 ./file3

519. C2 C1 C0 C2 C6 C7 C3 C4 C8 C9 C5 m/cupcake default experiment ./file1C1 ./file1 ./file2 C3 ./file1 ./file3 C4 ./file1 ./file3 ./file4

520. C2 C1 C0 C2 C6 C7 C3 C4 C8 C9 C5 m/cupcake default experiment ./file1C1 ./file1 ./file2 C3 ./file1 ./file3 C4 ./file1 ./file3 ./file4 C6 ./file1 ./file2 ./file6

521. C2 ./file1C1 ./file1 ./file2 C3 ./file1 ./file3 C4 ./file1 ./file3 ./file4 C6 ./file1 ./file2 ./file6 git diff c6 c4 +file3 +file4

523. C2 ./file1C1 ./file1 ./file2 C3 ./file1 ./file3 C4 ./file1 ./file3 ./file4 C6 ./file1 ./file2 ./file6 git diff c6 c4 +file3 +file4 -file2 -file6

527. C2 ./file1 ./file1 ./file2 C3 ./file1 ./file3 C4./file1 ./file2 ./file6 git diff c6...c4 +file3 +file4 ./file1 ./file3 ./file4 C6 C1

528. Undo

529. Single File

530. git checkout [commit] ﬁle

531. $ git checkout master@{yesterday} netcfg.c

532. $ git checkout v1.0 netcfg.c

533. Entire Project

534. git reset

535. $ git status # Not currently on any branch. # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: src/com/android/launcher/Workspace.java # # 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/launcher/LiveFolder.java #

539. by default, reset changes the staging area

541. $ git reset --hard

542. --hard changes stage and working directory

543. you’ve made commits, but want to move them to a topic branch

544. $ git branch experiment $ git reset --hard origin/master $ git checkout topicname

545. $ git branch experiment $ git reset --hard origin/master $ git checkout topicname

546. $ git branch experiment $ git reset --hard origin/master $ git checkout experiment

547. C0 HEAD C1origin/master master

548. C0 HEAD C1origin/master master C2 C3

549. C0 HEAD C1origin/master master C2 C3 experiment git checkout experiment

550. C0 HEAD C1origin/master master C2 C3 experiment git reset --hard origin/master

551. C0 HEAD C1origin/master master C2 C3 experiment C4 git commit

552. Debugging

553. Annotation

554. git blame

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

556. 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;

557. 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;

Git 101: An Introduction to Version Control with Git

Recomendados

Recomendados

Mais conteúdo relacionado

Mais procurados

Mais procurados (20)

Destaque

Destaque (10)

Semelhante a Git 101: An Introduction to Version Control with Git

Semelhante a Git 101: An Introduction to Version Control with Git (20)

Mais de Terry Wang

Mais de Terry Wang (14)

Último

Último (20)

Git 101: An Introduction to Version Control with Git