Wrangling Git

This is a combination of all the slides of the various versions of this talk that I've given over the years. It presents a lot of the more intermediate / esoteric Git stuff.

Transcript

1. Wrangling Git Scott Chacon
2. Me
3. Scott Anthony Chacon
5. http://git-scm.com
6. http://gitref.org
7. http://progit.org
8. @chacon
9. schacon@gmail.com
10. </me>
12. Get the Tutorial Repo git clone git://github.com/ghtraining/recipes.git
13. New Stuff
14. Colon Syntax
15. $ git show :/fix # shows the last commit which has the word "fix" in its message
16. $ git show :/love commit 1eee16988ed737b1805a5ed022bfa3f37dce8da5 Author: rick <technoweenie@gmail.com> Date: Wed Aug 11 20:43:57 2010 -0700 love ie8 diff --git a/public/javascripts/github/editbar.js b/public/javascri index d461822..d6c2ad4 100644 --- a/public/javascripts/github/editbar.js +++ b/public/javascripts/github/editbar.js @@ -170,7 +170,7 @@ $(function(){ var classes = $(this).attr('class').split(' ') var name = classes[0] var format = $('#guides .write select#wiki_format option:selec - if (classes.indexOf('gollum') == -1) { + if ($(this).hasClass('gollum')) { $('#editbar .sections .page.' + name + '.' + format).addClas } else { $('#editbar .sections .page.' + name).addClass('current')
17. $ git show :/^Merge # shows the last merge commit
18. $ git show :/^Merge commit 1549652ce43f07ad53baaa2ce4898a7df1a3d727 Merge: ec4b82b 3e92ceb Author: Ryan Tomayko <rtomayko@gmail.com> Date: Thu Aug 12 04:05:27 2010 -0700 Merge branch 'locale-whole-hash-cache'
19. Group Fetching
20. $ git config remotes.mygroup 'remote1 remote2 ...' $ git fetch mygroup
21. Short Status
22. git status -s -b
23. $ git status -sb ## master...origin/master [ahead 6] M ext/fsevent/fsevent_watch.c A Makefile ?? SCEvents/ ?? bin/fsevent_watch
24. Word Diffing
25. $ git diff diff --git a/timer.js b/timer.js index 4595967..8ba61dd 100644 --- a/timer.js +++ b/timer.js @@ -2,7 +2,7 @@ var timerSetUp = false; var timerRunning = false; var intervalRunning = false; var seconds = 0; -var totalMinutes = 45; +var totalMinutes = 120;
26. $ git diff --word-diff diff --git a/timer.js b/timer.js index 4595967..8ba61dd 100644 --- a/timer.js +++ b/timer.js @@ -2,7 +2,7 @@ var timerSetUp = false; var timerRunning = false; var intervalRunning = false; var seconds = 0; var totalMinutes = [-45;-]{+120;+}
27. Git Notes
28. for commenting on a commit without changing the SHA
29. $ git log commit 30e367cef2203eba2b341dc9050993b06fd1e108 Author: Chris Wanstrath <chris@ozmm.org> Date: Sun Mar 30 20:50:08 2008 -0700 timeout code and tests commit 5a0943123f6872e75a9b1dd0b6519dd42a186fda Author: Chris Wanstrath <chris@ozmm.org> Date: Sun Mar 30 16:31:20 2008 -0700 add timeout protection to grit
30. $ git notes edit 30e367
31. #commit 30e367cef2203eba2b341dc9050993b06fd1e108 #Author: Chris Wanstrath <chris@ozmm.org> #Date: Sun Mar 30 20:50:08 2008 -0700 # # timeout code and tests ~ ~ ~ "~/projects/grit2/.git/new-notes-30e367cef2203eba
32. #commit 30e367cef2203eba2b341dc9050993b06fd1e108 #Author: Chris Wanstrath <chris@ozmm.org> #Date: Sun Mar 30 20:50:08 2008 -0700 # # timeout code and tests Bugzilla: #2143 ~ ~ ~ "~/projects/grit2/.git/new-notes-30e367cef2203eba
33. $ git log commit 30e367cef2203eba2b341dc9050993b06fd1e108 Author: Chris Wanstrath <chris@ozmm.org> Date: Sun Mar 30 20:50:08 2008 -0700 timeout code and tests Notes: Bugzilla: #2143 commit 5a0943123f6872e75a9b1dd0b6519dd42a186fda Author: Chris Wanstrath <chris@ozmm.org> Date: Sun Mar 30 16:31:20 2008 -0700 add timeout protection to grit $ git notes show HEAD Bugzilla: #2143
34. Smart HTTP Transport
35. "Dumb" HTTP "Smart" HTTP
36. SetEnv GIT_PROJECT_ROOT /var/www/git SetEnv GIT_HTTP_EXPORT_ALL ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/
37. Grack http://github.com/schacon/grack
38. $ (edit config.ru to set git project path) $ rackup --host 127.0.0.1 -p 8080 config.ru $ git clone http://127.0.0.1:8080/schacon/grit.git
39. Old Stuff
40. Patch Staging
41. git add -p
42. $ git add -p diff --git a/src/index.h b/src/index.h index 864af6d..7c106af 100644 --- a/src/index.h +++ b/src/index.h @@ -6,6 +6,12 @@ #include "git/odb.h" #include "git/index.h" +#define GIT_IDXENTRY_NAMEMASK (0x0fff) +#define GIT_IDXENTRY_STAGEMASK (0x3000) +#define GIT_IDXENTRY_EXTENDED (0x4000) +#define GIT_IDXENTRY_VALID (0x8000) +#define GIT_IDXENTRY_STAGESHIFT 12 + typedef struct { uint32_t seconds; uint32_t nanoseconds; Stage this hunk [y,n,q,a,d,/,j,J,g,e,?]?
43. # Manual hunk edit mode -- see bottom for a quick guide @@ -6,6 +6,12 @@ #include "git/odb.h" #include "git/index.h" +#define GIT_IDXENTRY_NAMEMASK (0x0fff) +#define GIT_IDXENTRY_STAGEMASK (0x3000) +#define GIT_IDXENTRY_EXTENDED (0x4000) +#define GIT_IDXENTRY_VALID (0x8000) +#define GIT_IDXENTRY_STAGESHIFT 12 + typedef struct { uint32_t seconds; uint32_t nanoseconds; # --- # To remove '-' lines, make them ' ' lines (context). # To remove '+' lines, delete them. # Lines starting with # will be removed. # # If the patch applies cleanly, the edited hunk will immediatel # marked for staging. If it does not apply cleanly, you will be # an opportunity to edit again. If all lines of the hunk are re # then the edit is aborted and the hunk is left unchanged.
44. git gui
47. Tutorial edit a file, changing 2 different lines, one at the top of the file and one at the bottom stage and commit each change separately using git add -p do the same, but use git gui instead use git log -p to make sure they were recorded seperately
48. Describing Commits
49. git describe
50. $ git describe HEAD v0.2.4-25-g8a3f93b $ git describe HEAD@{1.month.ago} v0.2.4-6-gf51a8ba $ git describe 9903167e0c638d0e134d7e23bd43e66d97a51401 v0.1.4-46-g9903167
51. git name-rev
52. $ git name-rev 9903167e0c638d0e134d7e23bd43e66d97a51401 9903167e0c638d0e134d7e23bd43e66d97a51401 tags/v0.2.0~4 $ git name-rev --name-only 9903167e0c638d0e134d7e23bd43e66d97a51401 tags/v0.2.0~4 $ git name-rev --name-only --refs=refs/heads/* 9903167e0c638d0e134d master~36 $ git describe 9903167e0c638d0e134d7e23bd43e66d97a51401 v0.1.4-46-g9903167
53. $ git config --global alias.human \ "name-rev --name-only --refs=refs/heads/*" $ git human 6507580497bd4ebc1c73373528d16a5608797ad0 master~2^2~1^2 $ git log --oneline --decorate --graph * e6e8f33 (HEAD, tag: v0.2.5, master) updated to 0.2.5 * 8a3f93b stupid scott. messed up the results text color * 944de04 Merge remote branch 'rosskaff/master' |\ | * fc0e20c (rosskaff/master) Updgrade to jquery-1.4.2 * | aa55e9b Merge remote branch 'luniki/events' |\ \ | * | 4f808d2 trigger custom events on showing, and jumping to next | |/ * | 0d44711 Merge remote branch 'rick/master' |\| | * 87df635 (luniki/master) Merge branch 'update_readme' of git:/ | |\ | | * 6507580 Add links to my osbridge ganeti presentation | * | dd2357b added my talk to README
54. Git Under the Hood
55. The Git Database
95. Inspecting Git Objects
96. git cat-file -p
97. $ git cat-file -p HEAD tree 344ac3ca6eea32f4c517fa8ea97d5093933b892c parent deed1ee3e0818e833dbafb899020aa2c7f835dd6 author Matt Gauger <matt.gauger@gmail.com> 1269196110 -0500 committer Matt Gauger <matt.gauger@gmail.com> 1269196110 -0500 Notes from this attempt at baking them. $ git cat-file -p deed1ee3e0818e833dbafb899020aa2c7f835dd6 tree 33abee470cb69252ec4a41db5a619e15e9b93857 parent 46150e6978cf98ed9ca3e062cac9f7a225ac6e77 author Matt Gauger <matt.gauger@gmail.com> 1269194738 -0500 committer Matt Gauger <matt.gauger@gmail.com> 1269194738 -0500 Spelling mistakes >.<
98. $ git cat-file -p 33abee470cb69252ec4a41db5a619e15e9b93857 100644 blob 0d76a05d99ecf4ae2dbf5949 README 100644 blob 0a47f07a73cd6d6a46241348 easier-vegan-scones.md 100644 blob ff2e66e63bc48ff62227fcbd easy-vegan-scones.txt 100644 blob 6219d4b67e650bad0a160652 pumpkin-oatmeal-cookies-rec $ git cat-file -p ff2e66e63bc48ff62227fcbd376 | head -3 Easy Vegan Raisin Scones Yield: 16 scones 1/2 cup Earth Balance
99. Tutorial use git cat-file to simulate git log use git cat-file to see which files changed between v1.0 and v1.1
100. The Trees
101. HEAD, index, work tree
103. Environment Variables
104. moving around your git pieces
105. git directory index file working directory
106. GIT_DIR
107. $ mv .git /opt/repo.git $ git --git-dir=/opt/repo.git log $ export GIT_DIR=/opt/repo.git $ git log
108. GIT_INDEX_FILE
109. $ git status -s M README M kidgloves.rb $ git add kidgloves.rb $ git status -s M README S kidgloves.rb
110. $ export GIT_INDEX_FILE=/tmp/index $ git read-tree HEAD $ git add README $ git status -s S README M kidgloves.rb
111. $ unset GIT_INDEX_FILE $ git status -s M README S kidgloves.rb $ export GIT_INDEX_FILE=/tmp/index $ git status -s S README M kidgloves.rb
112. GIT_WORK_TREE
113. $ git status -s M README S kidgloves.rb $ export GIT_DIR=$(pwd)/.git $ export GIT_WORK_TREE=$(pwd) $ cd /tmp $ git status -s M README S kidgloves.rb
114. Using Reset Managing your trees
116. It points the HEAD ref at a new 'target' commit, if you specified one. Then it copies the tree of the HEAD commit to the index, unless you said --soft. Finally, it copies the contents of the index to the working tree, if you said --hard.
121. git reset
126. examples
127. unstaging changes
128. git reset [--mixed] HEAD -- file sets index to HEAD
129. undo last commit
130. git reset [--mixed] HEAD~ moves HEAD back and moves index back
131. squash the last 2 commits into a new one
132. git reset --soft HEAD~2 git commit moves HEAD back, keeps index
133. Tutorial
134. edit two files, stage one run git reset HEAD to undo the stage re-stage the file and commit run git reset --soft HEAD~ to undo the commit but keep the staged files commit again run git reset HEAD~ to undo the commit and all staging; commit again run git reset --hard HEAD~ to lose the commit and all that work
135. Stashing and Cleaning
136. Stashing
137. git stash
138. saving work in progress
139. $ git status -s M kidgloves.rb $ git stash Saved working directory and index state WIP on master: acca3c0 oops HEAD is now at acca3c0 oops. resolved that conflict somewhat wrongl $ git status # On branch master # Your branch is behind 'origin/master' by 3 commits, and can be fa # nothing to commit (working directory clean) $ git stash apply # On branch master # Your branch is behind 'origin/master' by 3 commits, and can be fa # # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working # # modified: kidgloves.rb # no changes added to commit (use "git add" and/or "git commit -a")
140. git stash --keep-index
141. $ git status -s MM kidgloves.rb $ git stash --keep-index Saved working directory and index state WIP on master: 686d28b allo HEAD is now at 686d28b allow calling server start, accept, stop ind $ git status -s M kidgloves.rb $ git stash apply Auto-merging kidgloves.rb # On branch master # Your branch is behind 'origin/master' by 2 commits, and can be fa # # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: kidgloves.rb # # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working # # modified: kidgloves.rb #
142. $ git stash save 'my really good stash' Saved working directory and index state On master: my really good s HEAD is now at 686d28b allow calling server start, accept, stop ind $ git stash list stash@{0}: On master: my really good stash stash@{1}: WIP on master: 686d28b allow calling server start, accep stash@{2}: WIP on master: acca3c0 oops. resolved that conflict some $ git stash show --stat stash@{0} kidgloves.rb | 46 ++-------------------------------------------- 1 files changed, 2 insertions(+), 44 deletions(-) $ git stash drop stash@{1} Dropped stash@{1} (a4e6c90d6282675e2f71091e1331b5679f967f00) $ git stash list stash@{0}: On master: my really good stash stash@{1}: WIP on master: acca3c0 oops. resolved that conflict some
143. save apply list show drop branch
144. Tutorial edit a file and stash the changes to that file naming the stash “my first file change” edit another file and stash the changes naming it “my second file change” apply the “second file change” stash and commit it drop the first change
145. Tutorial edit two files and stage one of them stash the unstaged changes edit another file and stash part of it commit apply both stashes and commit them
146. Cleaning
147. git clean -fdx
148. -f actually run the thing
149. -d do directories too
150. -x ignore the ignores
151. -X only stuff in .gitignore
152. $ git status -s ## master ?? build.o ?? mistake_file.c $ git clean -fdx Removing build.o Removing mistake_file.c Removing stupid.swp
153. $ git status -s ## master ?? build.o ?? mistake_file.c $ git clean -fX Removing stupid.swp
154. Tutorial create a .gitignore file with a *.o pattern create a build.o file with any content create a test.c file with any content use git clean to remove just the .o files use git clean to remove all untracked files
155. Data Mining
156. Reflog
157. $ git reflog 6b490d2 HEAD@{0}: checkout: moving from master to locale 53a33b7 HEAD@{1}: checkout: moving from local to master 6b490d2 HEAD@{2}: commit: updated almost all of the explore area 2a062e7 HEAD@{3}: commit (merge): Merge remote branch 'origin/maste d4409b8 HEAD@{4}: commit: started on the meta pages ce14759 HEAD@{5}: commit: plans page i18nd 79bbe8a HEAD@{6}: commit: home and login pages i18nd 0b9c5fa HEAD@{7}: commit: read-only/write descriptions i18nd 5ab5182 HEAD@{8}: commit: i think forkqueue is all done ae20364 HEAD@{9}: checkout: moving from master to local 53a33b7 HEAD@{10}: checkout: moving from local to master ae20364 HEAD@{11}: commit: forkqueue main page done 732f689 HEAD@{12}: commit: some setup screen translations 6a32edb HEAD@{13}: commit: i think issues is basically i18nd 5ee4b9d HEAD@{14}: commit: moved rails translation files into subdi c83a3d9 HEAD@{15}: commit (amend): replaced create issue button wit 189cd67 HEAD@{16}: commit (amend): replaced create issue button wit
158. $ git reflog show http_proxy cbe1aad http_proxy@{0}: commit: copied slummin to github for deps a 8dded6d http_proxy@{1}: commit: really add the benchmark 6e0bd39 http_proxy@{2}: commit: svn proxy benchmarking ab98772 http_proxy@{3}: commit: oops. wrong port f626f6e http_proxy@{4}: commit: pid file is here 48077c4 http_proxy@{5}: commit (amend): pulling in Grit changes fro 3169e43 http_proxy@{6}: commit: pulling in changes from slummin and d7e3c45 http_proxy@{7}: merge origin/master: Merge made by recursiv d7b2b6a http_proxy@{8}: commit: updated to all the config files 0dd2e03 http_proxy@{9}: commit: changed port 0ea0f22 http_proxy@{10}: commit: nginx config that works with svn b65a812 http_proxy@{11}: commit: for svn clients that are redonkulo 3eff356 http_proxy@{12}: commit (amend): sending proper headers now 1a8e1da http_proxy@{13}: commit (amend): sending proper headers now
159. $ git log -g http_proxy commit cbe1aad3efd172abf4ea05affdeb69052609c8a4 Reflog: http_proxy@{0} (Scott Chacon <schacon@gmail.com>) Reflog message: commit: copied slummin to github for deps and cap r Author: Scott Chacon <schacon@gmail.com> Date: Tue Jan 12 16:29:06 2010 -0800 copied slummin to github for deps and cap reuse commit 8dded6d16910c1497bb2810b43c097cfd908f84f Reflog: http_proxy@{1} (Scott Chacon <schacon@gmail.com>) Reflog message: commit: really add the benchmark Author: Scott Chacon <schacon@gmail.com> Date: Wed Dec 30 14:39:13 2009 -0800 really add the benchmark commit 6e0bd393322fa5a91214a9a1f0cb77ee59ac69d8 Reflog: http_proxy@{2} (Scott Chacon <schacon@gmail.com>) Reflog message: commit: svn proxy benchmarking Author: Scott Chacon <schacon@gmail.com> Date: Wed Dec 30 14:17:50 2009 -0800 svn proxy benchmarking
160. $ git show http_proxy@{3} commit ab98772c61d25d26e2f5713bbf28ba0bc06c1d79 Author: Scott Chacon <schacon@gmail.com> Date: Wed Dec 30 11:34:17 2009 -0800 oops. wrong port
161. $ git show http_proxy@{1.week.ago} commit 8dded6d16910c1497bb2810b43c097cfd908f84f Author: Scott Chacon <schacon@gmail.com> Date: Wed Dec 30 14:39:13 2009 -0800 really add the benchmark
162. Advanced Log
163. Log Formatting
164. git log --oneline
165. $ git log --oneline b809d9c Git 1.6.6-rc1 c0ecb07 git-pull.sh: Fix call to git-merge for new command format 28044ba Prepare for 1.6.5.4 ce9d823 merge: do not add standard message when message is given wi 76bf488 Do not misidentify "git merge foo HEAD" as an old-style inv c86485d Update draft release notes to 1.6.6 before -rc1 b81e00a git-merge: a deprecation notice of the ancient command line 92f676f get_ref_states: strdup entries and free util in stale list af6fbf9 help: Do not unnecessarily look for a repository 3c652d1 Documentation: Fix a few i.e./e.g. mix-ups 87e573f gitweb: Add link to other blame implementation in blame vie e627e50 gitweb: Make linking to actions requiring JavaScript a feat db9bc00 Documentation: Document --branch option in git clone synops e2ced7d builtin-merge: show user-friendly error messages for fast-f 264b774 merge-recursive: make the error-message generation an exter e160da7 t/README: Document GIT_TEST_INSTALLED and GIT_TEST_EXEC_PAT 5d59a40 t3409 t4107 t7406 t9150: use dashless commands ed87465 builtin-merge.c: call exclude_cmds() correctly.
166. git log --graph
167. $ git log --graph * commit c0ecb07048ce2123589a2f077d296e8cf29a9570 | Author: Horst H. von Brand <vonbrand@inf.utfsm.cl> | Date: Tue Dec 1 19:44:11 2009 -0300 | | git-pull.sh: Fix call to git-merge for new command format | | Now "git merge <msg> HEAD" is officially deprecated, we shoul | clean our own use as well. | | Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl> | Signed-off-by: Junio C Hamano <gitster@pobox.com> | * commit 0748494e866041034605aaf177f29a61bdc25951 |\ Merge: c86485d 28044ba | | Author: Junio C Hamano <gitster@pobox.com> | | Date: Wed Dec 2 10:30:12 2009 -0800 | | | | Merge branch 'maint' | | | | * maint: | | Prepare for 1.6.5.4 | | merge: do not add standard message when message is given
168. git log --decorate
169. $ git log --oneline --graph --decorate * b809d9c (HEAD, tag: v1.6.6-rc1, master) Git 1.6.6-rc1 * c0ecb07 git-pull.sh: Fix call to git-merge for new command format * 0748494 Merge branch 'maint' |\ | * 28044ba Prepare for 1.6.5.4 | * ce9d823 merge: do not add standard message when message is give | * 76bf488 Do not misidentify "git merge foo HEAD" as an old-style * | c86485d Update draft release notes to 1.6.6 before -rc1 * | 32ef08f Merge branch 'maint' |\ \ | |/ | * af6fbf9 help: Do not unnecessarily look for a repository | * 3c652d1 Documentation: Fix a few i.e./e.g. mix-ups | * db9bc00 Documentation: Document --branch option in git clone sy * | 36a83f3 Merge branch 'jc/deprecate-old-syntax-from-merge' |\ \ | * | b81e00a git-merge: a deprecation notice of the ancient comman * | | 4a27759 Merge branch 'bw/remote-get-ref-states-fix' |\ \ \
170. Log Filtering
171. --author --since, --after --until, --before --grep --all-match --no-merges --all -- (path)
172. $ git log --format="%h - %s" --author=gitster --since="2008-10-01" --before="2008-11-01" --no-merges -- t/ 5610e3b - Fix testcase failure when extended attr acd3b9e - Enhance hold_lock_file_for_{update,appe f563754 - demonstrate breakage of detached checko d1a43f2 - reset --hard/read-tree --reset -u: remo 51a94af - Fix "checkout --track -b newbranch" on b0ad11e - pull: allow "git pull origin $something
173. Pickaxe
174. $ git log -S[search]
175. $ git log -Sp4merge --oneline master 785c58e Update draft release notes to 1.6.6 c8998b4 mergetool--lib: add p4merge as a pre-c 48c74a5 git-gui: Support more merge tools.
176. Graph Subsets
195. quiz
196. git log origin/master ^master
197. git log master ^origin/master
198. Branch Diffing
199. $ git log --graph --oneline --decorate master experiment * 420eac9 (experiment) Added a method for getting the current branc | * 30e367c (HEAD, master) timeout code and tests | * 5a09431 add timeout protection to grit | * e1193f8 support for heads with slashes in them |/ * d6016bc require time for xmlschema * 11d191e Merge branch 'defunkt' into local $ git show --stat 420eac9 commit 420eac97a826bfac8724b6b0eef35c20922124b7 Author: Dustin Sallings <dustin@spy.net> Date: Tue Apr 1 10:52:03 2008 -0700 Added a method for getting the current branch. lib/grit/head.rb | 16 ++++++++++++++-- lib/grit/repo.rb | 9 ++++++++- 2 files changed, 22 insertions(+), 3 deletions(-)
200. git diff master experiment
201. $ git show --stat 420eac9 ... lib/grit/head.rb | 16 ++++++++++++++-- lib/grit/repo.rb | 9 ++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) $ git diff --stat master experiment lib/grit.rb | 2 - lib/grit/git.rb | 54 +++++--------------------------- lib/grit/head.rb | 19 ++++++++++++--- lib/grit/repo.rb | 9 ++++++- test/fixtures/for_each_ref | Bin 126 -> 58 bytes test/test_git.rb | 31 ------------------------- test/test_head.rb | 13 +++------- 7 files changed, 34 insertions(+), 94 deletions(-)
202. $ git log --graph --oneline --decorate master experiment * 420eac9 (experiment) Added a method for getting the current branc | * 30e367c (HEAD, master) timeout code and tests | * 5a09431 add timeout protection to grit | * e1193f8 support for heads with slashes in them |/ * d6016bc require time for xmlschema * 11d191e Merge branch 'defunkt' into local
203. git diff master...experiment
204. git diff master...experiment git diff $(git merge-base master experiment) experiment
205. $ git diff --stat master...experiment lib/grit/head.rb | 16 ++++++++++++++-- lib/grit/repo.rb | 9 ++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) $ git show --stat experiment commit 420eac97a826bfac8724b6b0eef35c20922124b7 Author: Dustin Sallings <dustin@spy.net> Date: Tue Apr 1 10:52:03 2008 -0700 Added a method for getting the current branch. lib/grit/head.rb | 16 ++++++++++++++-- lib/grit/repo.rb | 9 ++++++++- 2 files changed, 22 insertions(+), 3 deletions(-)
206. Tutorial find which commits introduced lines with the phrase 'raisins' in them how many commits were made in the month of march? how many commits were made by matt?
207. Tutorial find the difference in the sweet_potatoes branch from the master branch find the difference in the master branch from the sweet_potatoes branch find the commits in the sweet_potatoes branch not in the master branch find the commits in the master branch not in the sweet_potatoes branch
208. Bundles
209. $ git log commit 9a466c572fe88b195efd356c3f2bbeccdb504102 Author: Scott Chacon <schacon@gmail.com> Date: Wed Mar 10 07:34:10 2010 -0800 second commit commit b1ec3248f39900d2a406049d762aa68e9641be25 Author: Scott Chacon <schacon@gmail.com> Date: Wed Mar 10 07:34:01 2010 -0800 first commit
210. $ git bundle create repo.bundle master Counting objects: 6, done. Delta compression using up to 2 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (6/6), 441 bytes, done. Total 6 (delta 0), reused 0 (delta 0) $ ls -lh repo.bundle -rw-r--r-- 1 schacon schacon 6.4K Aug 12 09:45 repo.bundle
211. email repo.bundle to someone
212. $ git ls-remote repo.bundle 9a466c572fe88b195efd356c3f2bbeccdb504102 refs/heads/master $ git clone repo.bundle -b master repo Cloning into repo... $ cd repo $ git log --oneline 9a466c5 second commit b1ec324 first commit
213. $ git log --oneline 71b84da last commit - second repo c99cf5b fourth commit - second repo 7011d3d third commit - second repo 9a466c5 second commit b1ec324 first commit $ git log --oneline master ^origin/master 71b84da last commit - second repo c99cf5b fourth commit - second repo 7011d3d third commit - second repo $ git bundle create commits.bundle master ^origin/master Counting objects: 11, done. Delta compression using up to 2 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (9/9), 775 bytes, done. Total 9 (delta 0), reused 0 (delta 0) $ ls -lh commits.bundle -rw-r--r-- 1 maddog maddog 16.2K Aug 13 12:32 commits.bundle
214. email commits.bundle to original author
215. $ git bundle verify ../commits.bundle The bundle contains 1 ref 71b84daaf49abed142a373b6e5c59a22dc6560dc refs/heads/master The bundle requires these 1 ref 9a466c572fe88b195efd356c3f2bbeccdb504102 second commit ../commits.bundle is okay $ git bundle verify ../commits-bad.bundle error: Repository lacks these prerequisite commits: error: 7011d3d8fc200abe0ad561c011c3852a4b7bbe95 third commit - seco
216. $ git fetch ../commits.bundle master:other-master From ../commits.bundle * [new branch] master -> other-master $ git log --oneline --decorate --graph --all * 8255d41 (HEAD, master) third commit - first repo | * 71b84da (other-master) last commit - second repo | * c99cf5b fourth commit - second repo | * 7011d3d third commit - second repo |/ * 9a466c5 second commit * b1ec324 first commit
217. Branch Management
218. $ git branch android iss53 iss182 * master zindex $ git branch --merged iss53 * master zindex $ git branch --no-merged android iss182
219. $ git branch --contains 7e4a8bd2b iss53
220. Tutorial find which branches in the recipes repo are already merged find which branches are not yet merged
221. The Refspec
222. git remote add origin user@server:repo.git
223. .git/config [remote "origin"] url = user@server:repo.git fetch = +refs/heads/*:refs/remotes/origin/*
224. $ tree .git/refs .git/refs/ ├── heads │ ├── experiment │ ├── master │ └── testing ├── remotes │ ├── personal │ │ └── master │ └── origin │ ├── experiment │ └── master └── tags └── v1.0 $ cat .git/refs/heads/master e65062eeb3f54a2265a03b0a196480bd5266d5ea
225. master heads/master refs/heads/master
226. origin/master remotes/origin/master refs/remotes/origin/master
227. .git/config [remote "origin"] url = user@server:repo.git fetch = +refs/heads/*:refs/remotes/origin/* +[src]:[dest]
228. $ tree .git/refs .git/refs/ ├── heads │ ├── experiment │ ├── master │ └── testing ├── remotes │ ├── personal │ │ └── master │ └── origin │ ├── experiment │ └── master └── tags └── v1.0
229. '+' updates the reference even if it is not a fast- forward
230. .git/config [remote "origin"] url = user@server:repo.git fetch = +refs/heads/*:refs/remotes/origin/* [remote "personal"] url = user@chacon.com:myrepo.git fetch = +refs/heads/master:refs/remotes/origin/my_master [remote "github"] url = git@github.com:schacon/repo.git fetch = +refs/heads/*:refs/remotes/github/br/*
231. git fetch origin +master:refs/remotes/origin/master
232. $ git fetch origin master:refs/remotes/origin/mymaster \ topic:refs/remotes/origin/topic From git@github.com:schacon/simplegit ! [rejected] master -> origin/mymaster (non fast forwa * [new branch] topic -> origin/topic $ cat .git/config [remote "origin"] url = git@github.com:schacon/repo.git fetch = +refs/heads/master:refs/remotes/origin/master fetch = +refs/heads/topic:refs/remotes/origin/topic
233. Pushing Refspecs
234. $ git push origin master:another_name Total 0 (delta 0), reused 0 (delta 0) To git@github.com:schacon/repo.git * [new branch] master -> another_name $ git push origin :another_name To git@github.com:schacon/repo.git - [deleted] another_name $ cat .git/config [remote "origin"] url = user@server:repo.git fetch = +refs/heads/*:refs/remotes/origin/* push = +refs/heads/master:refs/heads/another_name [remote "github"] url = git@github.com:schacon/repo.git fetch = +refs/heads/*:refs/remotes/origin/* push = refs/heads/*:refs/heads/*
235. Tutorial fetch from the server all the refs in refs/secret
236. Revision Selection
237. Revision Selection full sha-1 partial sha-1 branch or tag name caret parent tilde spec blob spec
250. Blob Spec v1.1:README.txt
251. Relative Spec master@{1 month 2 weeks 3 days 1 hour ago}
252. Reflog Spec master@{5} fifth prior value of master
253. Colon Syntax
254. $ git show :/fix # shows the last commit which has the word "fix" in its message
255. $ git show :/love commit 1eee16988ed737b1805a5ed022bfa3f37dce8da5 Author: rick <technoweenie@gmail.com> Date: Wed Aug 11 20:43:57 2010 -0700 love ie8 diff --git a/public/javascripts/github/editbar.js b/public/javascri index d461822..d6c2ad4 100644 --- a/public/javascripts/github/editbar.js +++ b/public/javascripts/github/editbar.js @@ -170,7 +170,7 @@ $(function(){ var classes = $(this).attr('class').split(' ') var name = classes[0] var format = $('#guides .write select#wiki_format option:selec - if (classes.indexOf('gollum') == -1) { + if ($(this).hasClass('gollum')) { $('#editbar .sections .page.' + name + '.' + format).addClas } else { $('#editbar .sections .page.' + name).addClass('current')
256. $ git show :/^Merge # shows the last merge commit
257. $ git show :/^Merge commit 1549652ce43f07ad53baaa2ce4898a7df1a3d727 Merge: ec4b82b 3e92ceb Author: Ryan Tomayko <rtomayko@gmail.com> Date: Thu Aug 12 04:05:27 2010 -0700 Merge branch 'locale-whole-hash-cache'
258. man git-rev-parse progit.org/book/ch6-1.html
259. Rewriting History
260. Commit Amending
261. git commit --amend
262. git reset --soft HEAD~ git commit
263. Cherry Picking
275. Rebasing
296. Fun with Rebasing
297. git rebase --onto
298. Transplanting Topic Branches
321. Transplant some of a topic branch
361. Splitting a Commit
362. The Perils
370. Tutorial checkout a new branch called myrebase modify three files, commit each separately squash the second and third commits together using git rebase -i rebase the two new commits on top of the sweet_potatoes branch
371. Cherry
372. $ git log --oneline origin/gsoc-index ^HEAD b0941f9 Add support for inserting empty entries on the index 8c870fc Add support for extended index entries b376cb1 Add tests to t0601 to cover the TREE extension edc438e Move test resources to a common directory 933cb11 Add support for the TREE index extension 6018dbf Add unit tests for index manipulation $ git cherry -v HEAD origin/gsoc-index + 6018dbfa702b818590ae682bf9bbede716ef290e Add unit tests for index + 933cb118437ee8a4422e956197a8a4f09fd7e9df Add support for the TREE + edc438eedf6854c51e1a0d7954a6849046f5a4f6 Move test resources to a + b376cb120f0113294b80e7fd540d5dc197797764 Add tests to t0601 to co + 8c870fcebb8f625a8e172a49a44153af8f37c8b7 Add support for extended + b0941f9c70ffe67f0387a827b338e64ecf3190f0 Add support for insertin
373. $ git cherry-pick 6018dbfa70 Finished one cherry-pick. [test e144b96] Add unit tests for index manipulation Author: Vicent Marti <tanoku@gmail.com> 4 files changed, 209 insertions(+), 0 deletions(-) $ git cherry-pick edc438eedf (output) $ git cherry-pick b376cb1 (output) $ git cherry -v HEAD origin/gsoc-index - 6018dbfa702b818590ae682bf9bbede716ef290e Add unit tests for index + 933cb118437ee8a4422e956197a8a4f09fd7e9df Add support for the TREE - edc438eedf6854c51e1a0d7954a6849046f5a4f6 Move test resources to a - b376cb120f0113294b80e7fd540d5dc197797764 Add tests to t0601 to co + 8c870fcebb8f625a8e172a49a44153af8f37c8b7 Add support for extended + b0941f9c70ffe67f0387a827b338e64ecf3190f0 Add support for insertin
374. Advanced Merging
375. Merge Conflict Resolution
376. $ git merge topic Auto-merging index.html CONFLICT (content): Merge conflict in index.html Automatic merge failed; fix conflicts and then commit the result.
377. $ git diff diff --cc file.txt index 802992c,2b60207..0000000 --- a/file.txt +++ b/file.txt @@@ -1,1 -1,1 +1,5 @@@ ++<<<<<<< HEAD:file.txt +Hello world ++======= + Goodbye ++>>>>>>> 77976da35a11db4580b80ae27e8d65caf5208086:file.txt
378. $ git show :1:file.txt # the file in a common ancestor of both branches $ git show :2:file.txt # the version from HEAD. $ git show :3:file.txt # the version from MERGE_HEAD.
379. After Fixing
380. $ git diff diff --cc file.txt index 802992c,2b60207..0000000 --- a/file.txt +++ b/file.txt @@@ -1,1 -1,1 +1,1 @@@ - Hello world -Goodbye ++Goodbye world
381. git log --merge only commits that touch an unmerged file
382. git add [file] gets it out of the way
383. git checkout --ours -- [file]
384. git checkout --theirs -- [file]
385. git checkout -m -- [file]
386. git checkout --conflict=diff3 (file)
387. $ cat conflict_file.txt <<<<<<< HEAD 2 cups white rice 3 cups water ======= 1/3 cup uncooked white rice 2 cups water >>>>>>> conflict $ git checkout --conflict=diff3 conflict_file.txt <<<<<<< ours 2 cups white rice 3 cups water ||||||| base 2/3 cup uncooked white rice 1 cup water ======= 1/3 cup uncooked white rice 2 cups water >>>>>>> theirs
388. git config --global merge.conflictstyle diff3
389. git merge-file mine common theirs manually re-do a file merge
390. Fixing Whitespace Merge Hell $ git show :1:file.txt > common $ git show :2:file.txt > mine $ git show :3:file.txt > theirs $ dos2unix theirs $ git merge-file mine common theirs $ cp mine file.txt $ git add file.txt
391. abandon a merge
392. git reset --hard HEAD
393. other merging types
394. no fast forwarding
405. --no-ff
406. $ git merge hotfix Updating f42c576..3a0874c Fast forward README | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) $ git merge --no-ff hotfix Merge made by recursive. README | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
407. multi-head merge
408. git merge branchA branchB branchC branchD
409. $ git merge --no-ff topic1 topic2 Trying simple merge with topic1 Trying simple merge with topic2 Merge made by octopus. $ git log --decorate --graph --oneline *-. 4cfec1f (HEAD, master) Merge branches 'topic1' and 'topic2' |\ \ | | * 86cadbc (topic1) first topic fix | | * d91f9a8 first topic | |/ |/| * | a0fedb2 (origin/master) last commit on master | * f659f02 (topic2) second topic work |/ * aed1f32 base commit
410. --no-commit
411. $ git merge --no-commit topic1 Automatic merge went well; stopped before committing as requested $ cat .git/MERGE_HEAD 86cadbc69c20884d1fcb2494453bc44133b16d74 $ cat .git/MERGE_MSG Merge branch 'topic1'
412. --squash
413. $ git merge --squash topic1 Squash commit -- not updating HEAD Automatic merge went well; stopped before committing as requested $ git commit $ git log -1 commit 7657ee547b30f0f97519d14ba6577a999db48fd7 Author: Antonio Chacon <achacon@gmail.com> Date: Wed Jan 12 06:37:04 2011 -0800 Squashed commit of the following: commit f659f023856092916a4681f7fa6d5f2a4ea246d0 Author: Scott Chacon <schacon@gmail.com> Date: Tue Jan 11 01:00:47 2011 -0800 Made everything better
414. Tutorial merge the 'conflict' branch into master view the conflict diff with git diff view the conflict commits with git log --merge resolve the conflict using --thiers or --ours re-conflict the file with checkout -m or --conflict resolve the conflict and commit
415. Tutorial merge the sweet_potatoes and cookies branches in one at a time revert the merge merge both branches at the same time, non-fast-forward
416. Diff and Merge Tools
417. custom diff tool
418. git config --global diff.tool p4merge
419. $ git difftool
420. custom merge tool
421. ex: perforce visual merge tool
422. git config --global merge.tool p4merge
423. kdiff3 tkdiff meld emerge vimdiff opendiff
424. $ git mergetool
425. non-supported merge tool
426. $ cat ~/.gitconfig [merge] tool = extMerge [mergetool "extMerge"] cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED" trustExitCode = false
427. Submodules
428. Starting with Submodules
429. $ git submodule add git://github.com/rack/rack.git rack Initialized empty Git repository in /opt/subtest/rack/.git/ remote: Counting objects: 3181, done. remote: Compressing objects: 100% (1534/1534), done. remote: Total 3181 (delta 1951), reused 2623 (delta 1603) Receiving objects: 100% (3181/3181), 675.42 KiB | 422 KiB/s, done. Resolving deltas: 100% (1951/1951), done. $ git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # new file: .gitmodules # new file: rack #
430. $ cat .gitmodules [submodule "rack"] path = rack url = git://github.com/rack/rack.git $ git diff --cached rack diff --git a/rack b/rack new file mode 160000 index 0000000..08d709f --- /dev/null +++ b/rack @@ -0,0 +1 @@ +Subproject commit 08d709f78b8c5b0fbeb7821e37fa53e69afcf433
431. $ git commit -m 'first commit with submodule rack' [master 0550271] first commit with submodule rack 2 files changed, 4 insertions(+), 0 deletions(-) create mode 100644 .gitmodules create mode 160000 rack
432. $ git log -1 commit 0550271328a0038865aad6331e620cd7238601bb Author: Scott Chacon <schacon@gmail.com> Date: Thu Apr 9 09:03:56 2009 -0700 first commit with submodule rack $ cd rack/ $ git log -1 commit 08d709f78b8c5b0fbeb7821e37fa53e69afcf433 Author: Christian Neukirchen <chneukirchen@gmail.com> Date: Wed Mar 25 14:49:04 2009 +0100 Document version change
433. Cloning a Project with Submodules
434. $ git clone git://github.com/schacon/myproject.git Initialized empty Git repository in /opt/myproject/.git/ remote: Counting objects: 6, done. remote: Compressing objects: 100% (4/4), done. remote: Total 6 (delta 0), reused 0 (delta 0) Receiving objects: 100% (6/6), done. $ cd myproject $ ls -l total 8 -rw-r--r-- 1 schacon admin 3 Apr 9 09:11 README drwxr-xr-x 2 schacon admin 68 Apr 9 09:11 rack $ ls rack/ $
435. $ git submodule init Submodule 'rack' (git://github.com/rack/rack.git) registered for pa $ git submodule update Initialized empty Git repository in /opt/myproject/rack/.git/ remote: Counting objects: 3181, done. remote: Compressing objects: 100% (1534/1534), done. remote: Total 3181 (delta 1951), reused 2623 (delta 1603) Receiving objects: 100% (3181/3181), 675.42 KiB | 173 KiB/s, done. Resolving deltas: 100% (1951/1951), done. Submodule path 'rack': checked out '08d709f78b8c5b0fbeb7821e37fa53e
436. $ git fetch # fetches commits with an update to the submodule $ git merge origin/master Updating 0550271..85a3eee Fast forward rack | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) [master*]$ git status # On branch master # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working # # modified: rack #
437. $ git diff diff --git a/rack b/rack index 6c5e70b..08d709f 160000 --- a/rack +++ b/rack @@ -1 +1 @@ -Subproject commit 6c5e70b984a60b3cecd395edd5b48a7575bf58e0 +Subproject commit 08d709f78b8c5b0fbeb7821e37fa53e69afcf433 $ git submodule update remote: Counting objects: 5, done. remote: Compressing objects: 100% (3/3), done. remote: Total 3 (delta 1), reused 2 (delta 0) Unpacking objects: 100% (3/3), done. From git@github.com:schacon/rack 08d709f..6c5e70b master -> origin/master Submodule path 'rack': checked out '6c5e70b984a60b3cecd395edd5b48a7
438. Non-public Submodules
439. $ git submodule update fatal: reference isn’t a tree: 6c5e70b984a60b3cecd395edd5b48a7575bf Unable to checkout '6c5e70b984a60b3cecd395edd5ba7575bf58e0' in subm $ git log -1 rack commit 85a3eee996800fcfa91e2119372dd4172bf76678 Author: Scott Chacon <schacon@gmail.com> Date: Thu Apr 9 09:19:14 2009 -0700 added a submodule reference I will never make public. hahahahah
440. Issues with Submodules
441. submodules in branches
442. $ git checkout -b rack Switched to a new branch "rack" $ git submodule add git@github.com:schacon/rack.git rack Initialized empty Git repository in /opt/myproj/rack/.git/ ... Receiving objects: 100% (3184/3184), 677.42 KiB | 34 KiB/s, done. Resolving deltas: 100% (1952/1952), done. $ git commit -am 'added rack submodule' [rack cc49a69] added rack submodule 2 files changed, 4 insertions(+), 0 deletions(-) create mode 100644 .gitmodules create mode 160000 rack $ git checkout master Switched to branch "master" $ git status # On branch master # Untracked files: # (use "git add <file>..." to include in what will be committed) # # rack/
443. changing from a directory to a submodule
444. $ rm -Rf rack/ $ git submodule add git@github.com:schacon/rack.git rack 'rack' already exists in the index $ git rm -r rack $ git submodule add git@github.com:schacon/rack.git rack Initialized empty Git repository in /opt/testsub/rack/.git/ remote: Counting objects: 3184, done. remote: Compressing objects: 100% (1465/1465), done. remote: Total 3184 (delta 1952), reused 2770 (delta 1675) Receiving objects: 100% (3184/3184), 677.42 KiB | 88 KiB/s, done. Resolving deltas: 100% (1952/1952), done. $ git checkout master error: Untracked working tree file 'rack/AUTHORS' would be overwrit $ mv rack /tmp/ $ git checkout master Switched to branch "master" $ ls README rack
445. Subtree Merging
446. $ git remote add rack_remote git@github.com:schacon/rack.git $ git fetch rack_remote warning: no common commits remote: Counting objects: 3184, done. remote: Compressing objects: 100% (1465/1465), done. remote: Total 3184 (delta 1952), reused 2770 (delta 1675) Receiving objects: 100% (3184/3184), 677.42 KiB | 4 KiB/s, done. Resolving deltas: 100% (1952/1952), done. From git@github.com:schacon/rack * [new branch] build -> rack_remote/build * [new branch] master -> rack_remote/master * [new branch] rack-0.4 -> rack_remote/rack-0.4 * [new branch] rack-0.9 -> rack_remote/rack-0.9 $ git checkout -b rack_branch rack_remote/master Branch rack_branch set up to track remote branch refs/remotes/rack_ Switched to a new branch "rack_branch"
447. $ ls AUTHORS KNOWN-ISSUES Rakefile contrib lib COPYING README bin example test $ git checkout master Switched to branch "master" $ ls README
448. $ git read-tree --prefix=rack/ -u rack_branch $ git checkout rack_branch $ git pull $ git checkout master $ git merge --squash -s subtree --no-commit rack_branch Squash commit -- not updating HEAD Automatic merge went well; stopped before committing as requested
449. Tracking Branches
450. $ git fetch remote: Counting objects: 535, done. remote: Compressing objects: 100% (154/154), done remote: Total 426 (delta 317), reused 369 (delta Receiving objects: 100% (426/426), 52.49 KiB, don Resolving deltas: 100% (317/317), completed with From github.com:github/github * [new branch] frotz -> origin/frotz 9893ff7..1549652 master -> origin/master
451. git checkout origin/frotz -> detaches HEAD git checkout -b frotz origin/frotz -> tracking git checkout -t origin/frotz -> tracking git checkout frotz -> tracking git checkout -t frotz -> fatal: Missing branch name
452. $ git push -u origin frotz # pushes the "frotz" branch to "origin" remote and sets up tracking
453. push.default
454. $ git config --global push.default matching $ git config --global push.default nothing $ git config --global push.default tracking $ git config --global push.default current
455. Replacements and Grafting
456. $ git log --oneline ef989d8 fifth commit c6e1e95 fourth commit 9c68fdc third commit 945704c second commit c1822cf first commit
458. $ git branch history master~1 $ git log --oneline --decorate ef989d8 (HEAD, master) fifth commit c6e1e95 (history) fourth commit 9c68fdc third commit 945704c second commit c1822cf first commit
460. $ git remote add history git@github.com:schacon/project-history.git $ git push history history:master Counting objects: 12, done. Delta compression using up to 2 threads. Compressing objects: 100% (4/4), done. Writing objects: 100% (12/12), 907 bytes, done. Total 12 (delta 0), reused 0 (delta 0) Unpacking objects: 100% (12/12), done. To git@github.com:schacon/project-history.git * [new branch] history -> master $ git log --oneline --decorate ef989d8 (HEAD, master) fifth commit c6e1e95 (history) fourth commit 9c68fdc third commit 945704c second commit c1822cf first commit
462. $ echo 'get history from blah blah blah' > msg $ cat msg | git commit-tree history~1^{tree} 622e88e9cbfbacfb75b5279245b9fb38dfea10cf
464. $ git rebase --onto 622e88 9c68fdc First, rewinding head to replay your work on top of it... Applying: fourth commit Applying: fifth commit
466. $ git clone git://github.com/schacon/project.git $ cd project $ git log --oneline master e146b5f fifth commit 81a708d fourth commit 622e88e get history from blah blah blah $ git remote add history git://github.com/schacon/project-history.g $ git fetch history From git://github.com/schacon/project-history.git * [new branch] master -> history/master $ git log --oneline history/master c6e1e95 fourth commit 9c68fdc third commit 945704c second commit c1822cf first commit
467. $ git log --oneline e146b5f fifth commit 81a708d fourth commit 622e88e get history from blah blah blah $ git replace 81a708d c6e1e95 $ git log --oneline e146b5f fifth commit 81a708d fourth commit 9c68fdc third commit 945704c second commit c1822cf first commit
469. $ git cat-file -p 81a708d tree 7bc544cf438903b65ca9104a1e30345eee6c083d parent 9c68fdceee073230f19ebb8b5e7fc71b479c0252 author Scott Chacon <schacon@gmail.com> 1268712581 -0700 committer Scott Chacon <schacon@gmail.com> 1268712581 -0700 fourth commit $ git --no-replace-references cat-file -p 81a708d tree 7bc544cf438903b65ca9104a1e30345eee6c083d parent 622e88e9cbfbacfb75b5279245b9fb38dfea10cf author Scott Chacon <schacon@gmail.com> 1268712581 -0700 committer Scott Chacon <schacon@gmail.com> 1268712581 -0700 fourth commit
470. $ git for-each-ref e146b5f14e79d49351 commit refs/heads/master c6e1e95051d41771a6 commit refs/remotes/history/master e146b5f14e79d49351 commit refs/remotes/origin/HEAD e146b5f14e79d49351 commit refs/remotes/origin/master c6e1e95051d41771a6 commit refs/replace/81a708dd0e167a3f691541c7a6
471. Grafts
472. .git/info/grafts
473. $ echo "84adefa33143d 9c6fdd21e4e65" > .git/info/grafts
474. git diff grafts replace easier to share (refs) easier to ignore any object
475. Erlang http://github.com/erlang/otp/wiki/Extending-the-history-of-Erlang-OTP
476. Tutorial clone git://github.com/ghtraining/re-small.git and follow the instructions to graft the history back on re-graft the history a few commits higher
477. Reuse Recorded Resolution rerere
478. git config --global rerere.enabled 1
479. Original File #! /usr/bin/env ruby def hello puts 'hello world' end
480. in master branch #! /usr/bin/env ruby def hello puts 'hello mundo' end
481. in i18n-world branch #! /usr/bin/env ruby def hello puts 'hola world' end
482. $ git merge i18n-world Auto-merging hello.rb CONFLICT (content): Merge conflict in hello.rb Recorded preimage for 'hello.rb' Automatic merge failed; fix conflicts and then commit the result. $ git rerere status hello.rb
483. $ # edit hello.rb to be 'hola mundo' $ git add hello.rb
484. $ git rerere diff --- a/hello.rb +++ b/hello.rb @@ -1,11 +1,7 @@ #! /usr/bin/env ruby def hello - - puts 'hello mundo' -======= - puts 'hola world' ->>>>>>> + puts 'hola mundo' end
485. $ git commit Recorded resolution for 'hello.rb'. [master 68e16e5] Merge branch 'i18n'
486. $ git reset --hard HEAD^ HEAD is now at ad63f15 i18n the hello $ git checkout i18n-world Switched to branch 'i18n-world' $ git rebase master First, rewinding head to replay your work on top of it... Applying: i18n one word Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging hello.rb CONFLICT (content): Merge conflict in hello.rb Resolved 'hello.rb' using previous resolution. Failed to merge in the changes. Patch failed at 0001 i18n one word
487. $ cat hello.rb #! /usr/bin/env ruby def hello puts 'hola mundo' end $ git diff diff --cc hello.rb index a440db6,54336ba..0000000 --- a/hello.rb +++ b/hello.rb @@@ -1,7 -1,7 +1,7 @@@ #! /usr/bin/env ruby def hello - puts 'hola world' - puts 'hello mundo' ++ puts 'hola mundo' end
488. $ git checkout --conflict=merge hello.rb $ cat hello.rb #! /usr/bin/env ruby def hello <<<<<<< ours puts 'hola world' ======= puts 'hello mundo' >>>>>>> theirs end $ git rerere Resolved 'hello.rb' using previous resolution. $ cat hello.rb #! /usr/bin/env ruby def hello puts 'hola mundo' end $ git add hello.rb $ git rebase --continue Applying: i18n one word
489. git merge --rerere-autoupdate
490. git config --global rerere.autoupdate 1
491. Debugging
492. git blame ie: "what dumbass did this? oh yeah, it was me..."
493. $ 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-lin 77cb17e9 (Michal Ostrowski 2006-01-10 21:12:17 -0500 3) #include "exec_cm 49ba83fb (Jon Loeliger 2006-09-19 20:31:51 -0500 4) #include "interpo 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. 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 695dffe2 (Johannes Schindelin 2006-09-28 12:00:35 +0200 9) #define HOST_NAME 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_MAXSER 415e7b87 (Patrick Welche 2007-10-18 18:17:39 +0100 13) #define NI_MAXSER 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_sy f8ff0c06 (Petr Baudis 2005-09-22 11:25:28 +0200 17) static int verbos 1955fabf (Mark Wooding 2006-02-03 20:27:04 +0000 18) static int reusea 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 1b1dd23f (Stephan Beyer 2008-07-13 15:36:15 +0200 21) "git daemon [--ve 3bd62c21 (Stephen R. van den Berg 2008-08-14 20:02:20 +0200 22) " [--ti 3bd62c21 (Stephen R. van den Berg 2008-08-14 20:02:20 +0200 23) " [--st 73a7a656 (Jens Axboe 2007-07-27 14:00:29 -0700 24) " [--us 49ba83fb (Jon Loeliger 2006-09-19 20:31:51 -0500 25) " [--in 678dac6b (Tilman Sauerbeck 2006-08-22 19:37:41 +0200 26) " [--re d9edcbd6 (Junio C Hamano 2006-09-07 01:40:04 -0700 27) " [--[e dd467629 (Jon Loeliger 2006-09-26 09:47:43 -0500 28) " [--in
494. $ git blame -C GITPackUpload.m f344f58d Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 12) f344f58d Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 13) #defin f344f58d Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 14) #defin f344f58d Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 15) ad11ac80 Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 16) @imple ad11ac80 Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 17) ad11ac80 Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 18) @synth ad11ac80 Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 19) @synth ad11ac80 Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 20) @synth ad11ac80 Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 21) @synth ad11ac80 Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 22) a2cbabf5 Network/GITPackUpload.m (Scott Chacon 2009-03-25 22:29:39 23) - (id) ad11ac80 Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 24) { a2cbabf5 Network/GITPackUpload.m (Scott Chacon 2009-03-25 22:29:39 25) ad11ac80 Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 26) ad11ac80 Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 27) ad11ac80 Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 28) ad11ac80 Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 29) } ad11ac80 Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 30) ad11ac80 Network/GITPackUpload.m (Scott Chacon 2009-03-24 18:32:50 31) - (boo f344f58d Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 32) { f344f58d Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 33) f344f58d Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 34) f344f58d Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 35) f344f58d Network/GITServerHandler.m (Scott Chacon 2009-01-04 18:59:04 36) 56ef2caf Network/GITServerHandler.m (Scott Chacon 2009-01-05 21:44:26 37)
495. $ git blame -L23,29 Source/Network/GITPackUpload.m a2cbabf5 a2cbabf5 (Scott Chacon 2009-03-25 22:29:39 +0100 23) - (id) initWithGit:(GITRepo *) ad11ac80 (Scott Chacon 2009-03-24 18:32:50 +0100 24) { a2cbabf5 (Scott Chacon 2009-03-25 22:29:39 +0100 25) gitRepo = gRepo; ad11ac80 (Scott Chacon 2009-03-24 18:32:50 +0100 26) needRefs = nRefs; ad11ac80 (Scott Chacon 2009-03-24 18:32:50 +0100 27) gitSocket = gSocket; ad11ac80 (Scott Chacon 2009-03-24 18:32:50 +0100 28) return self; ad11ac80 (Scott Chacon 2009-03-24 18:32:50 +0100 29) }
496. Bisecting
497. binary search for where a bug was introduced
498. $ git bisect start $ git bisect bad $ git bisect good v1.0 Bisecting: 9 revisions left to test after this (roughly 3 steps) [1fe13deb3187e193b9ec9ba6d70ac58934c6aa32] Adding routes to help fr $ git bisect bad Bisecting: 4 revisions left to test after this (roughly 2 steps) [93f150ab7e6bda806148205dab5a50cca16ef7a3] Move bounces to fix some $ git bisect good Bisecting: 2 revisions left to test after this (roughly 1 step) [ac7c7346526f7b1be68775d2f7620f726813e229] Fix 404 pages. Closes #3 $ git bisect bad Bisecting: 0 revisions left to test after this (roughly 0 steps) [c4131e24d1f97b8ff105d184d5cf4a954c1c70ec] fix org tests $ git bisect bad c4131e24d1f97b8ff105d184d5cf4a954c1c70ec is the first bad commit commit c4131e24d1f97b8ff105d184d5cf4a954c1c70ec Author: rick <technoweenie@gmail.com> Date: Thu Oct 14 13:09:10 2010 -0700 fix org tests :040000 040000 05e813cf1a32269ed023982dd9bfe433934a34b6 18759354c08
499. Tutorial find the user who last edited line 5 of mexican_food_ingredients.txt find the user who edited that line before him find the file that line originally came from find the first commit that broke the raisins.sh script (it works in 5a1aae2)
500. Scripting
501. Environment Variables
502. moving around your git pieces
503. git directory index file working directory
504. GIT_DIR
505. $ mv .git /opt/repo.git $ git --git-dir=/opt/repo.git log $ export GIT_DIR=/opt/repo.git $ git log
506. GIT_INDEX_FILE
507. $ git status -s M README M kidgloves.rb $ git add kidgloves.rb $ git status -s M README S kidgloves.rb
508. $ export GIT_INDEX_FILE=/tmp/index $ git read-tree HEAD $ git add README $ git status -s S README M kidgloves.rb
509. $ unset GIT_INDEX_FILE $ git status -s M README S kidgloves.rb $ export GIT_INDEX_FILE=/tmp/index $ git status -s S README M kidgloves.rb
510. GIT_WORK_TREE
511. $ git status -s M README S kidgloves.rb $ export GIT_DIR=$(pwd)/.git $ export GIT_WORK_TREE=$(pwd) $ cd /tmp $ git status -s M README S kidgloves.rb
512. Overwriting your credentials
513. GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
514. Debugging Git
515. GIT_MERGE_VERBOSITY
516. $ git merge 06ca03a Auto-merging kidgloves.rb Merge made by recursive. kidgloves.rb | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) $ git reset --hard 096880d HEAD is now at 096880d use idiomatic rack :Host and :Port options $ GIT_MERGE_VERBOSITY=5 git merge 06ca03a Merging: 096880d use idiomatic rack :Host and :Port options virtual 06ca03a found 1 common ancestor(s): 66d35ee wasnt setting the header vars properly Auto-merging kidgloves.rb Merge made by recursive. kidgloves.rb | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
517. GIT_TRACE
518. $ GIT_TRACE=1 git lol trace: exec: 'git-lol' trace: run_command: 'git-lol' trace: alias expansion: lol => 'log' '--oneline' '--graph' '--decor trace: run_command: 'less' trace: exec: 'less' trace: built-in: git 'log' '--oneline' '--graph' '--decorate' * b896af7 (HEAD, test) Merge commit '06ca03a' into test |\ | * 06ca03a (rtomayko/headernames) no need to delete these header n | * 8cebd9f CONTENT_TYPE and CONTENT_LENGTH are not prefixed with H | * 8aff92c request header env keys get HTTP_ prefix * | 096880d (rtomayko/bindopts) use idiomatic rack :Host and :Port * | 801e40a log to stderr instead of stdout * | 7295993 take listen host/port |/
519. GIT_CURL_VERBOSE
520. $ GIT_CURL_VERBOSE=1 git clone http://github.com/schacon/showoff.gi Cloning into showoff... * Couldn't find host github.com in the .netrc file; using defaults * About to connect() to github.com port 80 (#0) * Trying 207.97.227.239... * Connected to github.com (207.97.227. > GET /schacon/showoff.git/info/refs?service=git-upload-pack HTTP/1 User-Agent: git/1.7.2.1 Host: github.com Accept: */* Pragma: no-cache < HTTP/1.1 200 OK < Server: nginx/0.7.67 < Date: Wed, 11 Aug 2010 20:21:35 GMT < Content-Type: application/x-git-upload-pack-advertisement < Connection: keep-alive < Status: 200 OK < Pragma: no-cache < Content-Length: 1316 < Expires: Fri, 01 Jan 1980 00:00:00 GMT < Cache-Control: no-cache, max-age=0, must-revalidate < * Expire cleared * Connection #0 to host github.com left intact * Couldn't find host github.com in the .netrc file; using defaults * About to connect() to github.com port 80 (#0) * Trying 207.97.227.239... * connected * Connected to github.com (207.97.227.239) port 80 (#0) > POST /schacon/showoff.git/git-upload-pack HTTP/1.1
521. > POST /schacon/showoff.git/git-upload-pack HTTP/1.1 User-Agent: git/1.7.2.1 Host: github.com Accept-Encoding: deflate, gzip Content-Type: application/x-git-upload-pack-request Accept: application/x-git-upload-pack-result Content-Length: 866 < HTTP/1.1 200 OK < Server: nginx/0.7.67 < Date: Wed, 11 Aug 2010 20:21:35 GMT < Content-Type: application/x-git-upload-pack-result < Transfer-Encoding: chunked < Connection: keep-alive < Status: 200 OK < remote: Counting objects: 1364, done. remote: Compressing objects: 100% (843/843), done. remote: Total 1364 (delta 756), reused 906 (delta 468) * Connection #0 to host github.com left intact Receiving objects: 100% (1364/1364), 342.25 KiB, done. Resolving deltas: 100% (756/756), done. Ribbit
522. Ruby + Bindings + Git == Ribbit
523. libgit2 - GSoC
524. libgit2.github.com
525. Revlist / Log
526. @ribbit = Ribbit::Repository.new(path) @walker = Ribbit::Walker.new(@ribbit) def ribbit_log(walker, sha) walker.push(sha) data = [] while sha = walker.next do data << sha end data end ribbit_log(@walker, head)
527. Rev List - 16,000 Commits 1x Grit : 1.067s Ribbit: 1.053s
528. Rev List - 210 Commits 200x Grit : 3.370s Ribbit: 0.081s
529. 40x
530. Rev List - 15 Commits x 200 Grit : 2.7126s Ribbit: 0.0067s
531. 450x
532. Revision Walker API walker = Ribbit::Walker.new(repo) walker.push(hex_sha_interesting) walker.hide(hex_sha_uninteresting) hex_sha = walker.next # false if none left walker.reset
533. Small Blob Read
534. @ribbit = Ribbit::Repository.new(path) o = @ribbit.lookup(blob_sha) puts o.sha puts o.data
535. >> c = @ribbit.lookup(commit_sha) >> puts c.message "my commit message\n" >> pp c.author {"name"=>"Scott Chacon", "time"=>1273360386, "email"=>"schacon@gmail.com"}
536. Small Blob Read 1k file x 10000 Grit : 0.96461s Ribbit: 0.27974s
537. 4x
538. Object Exists
539. @ribbit = Ribbit::Repository.new(path) @ribbit.exists(sha)
540. Object Exists (50x) Grit (loose): 23.263354 Grit (packd): 0.388390 Ribbit (loose): 0.036332 Ribbit (packd): 0.030283
541. 10x to 1000x
542. Low-Level Object API repo = Ribbit::Repository.new(path) bool = repo.exists(hex_sha) data, length, type = repo.read(hex_sha) # or false hex_sha = repo.hash(content, type) hex_sha = repo.write("my content\n", "blob")
543. Other Languages
544. Geef - Erlang Git NIF http://github.com/schacon/geef geef:start(). Raw = geef:hex_to_raw(HexSha). Exists = geef:object_exists(ObjectsPath, HexSha).
545. Customizing Git
546. Autocorrect
547. $ git com git: 'com' is not a git-command. See 'git --help'. Did you mean this? commit
548. help.autocorrect
549. git config --global help.autocorrect 1
550. $ git com WARNING: You called a Git program named 'com', which does not exist Continuing under the assumption that you meant 'commit'
551. Colors
552. git config --global color.ui true
553. Git Attributes
554. .gitattributes
555. Diff Binary Files
556. $ git diff diff --git a/image.png b/image.png index 88839c4..4afcb7c 100644 Binary files a/image.png and b/image.png differ
557. tell Git how to diff a binary file
558. exiftool
559. $ exiftool image.png ExifTool Version Number : 7.74 File Name : image.png Directory : . File Size : 94 kB File Modification Date/Time : 2009:04:21 07:02:43-07:00 File Type : PNG MIME Type : image/png Image Width : 1056 Image Height : 827 Bit Depth : 8 Color Type : RGB with Alpha Compression : Deflate/Inflate Filter : Adaptive Interlace : Noninterlaced Profile CMM Type : appl Profile Version : 2.0.0 Profile Class : Display Device Profile Color Space Data : RGB Profile Connection Space : XYZ Profile Date Time : 2009:04:05 12:26:58 Profile File Signature : acsp Primary Platform : Apple Computer Inc. CMM Flags : Not Embedded, Independent ...
560. $ echo '*.png diff=exif' >> .gitattributes # take every file that ends in png # and pre-process them with a strategy called ‘exif’ $ git config diff.exif.textconv exiftool # the 'exif' strategy is to run exiftool on the file
561. $ git diff diff --git a/image.png b/image.png index 88839c4..4afcb7c 100644 --- a/image.png +++ b/image.png @@ -1,12 +1,12 @@ ExifTool Version Number : 7.74 -File Size : 70 kB -File Modification Date/Time : 2009:04:21 07:02:45-07:00 +File Size : 94 kB +File Modification Date/Time : 2009:04:21 07:02:43-07:00 File Type : PNG MIME Type : image/png -Image Width : 1058 -Image Height : 889 +Image Width : 1056 +Image Height : 827 Bit Depth : 8 Color Type : RGB with Alpha
562. Filtering
570. expanding a $Date$
571. /usr/bin/expand_date #! /usr/bin/env ruby data = STDIN.read date = `git log --pretty=format:"%ad" -1` puts data.gsub('$Date$', '$Date: ' + date + '$')
572. $ git config filter.dater.smudge expand_date $ git config filter.dater.clean \ 'perl -pe "s/\\\$Date[^\\\$]*\\\$/\\\$Date\\\$/"'
573. test it
574. $ echo '# $Date$' > date_test.rb $ echo 'date*.rb filter=dater' >> .gitattributes $ git add date_test.rb .gitattributes $ git commit -m "Testing date expansion in Git" $ rm date_test.rb $ git checkout date_test.rb $ cat date_test.rb # $Date: Tue Apr 21 07:26:52 2009 -0700$
575. Aliases
576. $ git config --global alias.lol \ "log --oneline --decorate --graph" $ git lol * 6b490d2 (HEAD, locale) updated almost all of the explore area * 2a062e7 (origin/locale) Merge remote branch 'origin/master' int |\ | * 29ffbab (origin/master, origin/HEAD) Merge branch 'master' of | |\ | | * e3f4eaf Merge branch 'master' of github.com:defunkt/github | | |\ | | * | c12388e Kill site layout again | * | | 12e882a random repo link | | |/ | |/| | * | 154ab93 80c | * | ce2d3f6 use the master branch (not necessarily master) when b | * | 81de6b0 1 per gist, less strict jetpack search | * | 8eb5cc1 it only worked in my mind
577. Local Hooks
578. $ tree .git/hooks/ .git/hooks/ ├── applypatch-msg.sample ├── commit-msg.sample ├── post-commit.sample ├── post-receive.sample ├── post-update.sample ├── pre-applypatch.sample ├── pre-commit.sample ├── pre-rebase.sample ├── prepare-commit-msg.sample └── update.sample $ mv .git/hooks/pre-commit.sample .git/hooks/pre-commit $ chmod +x .git/hooks/pre-commit
579. Commit Process Hooks
580. pre-commit
581. #!/usr/bin/env ruby # only allows you to modify certain subdirs in a project def check_directory_perms access = ['doc', 'tests'] mod = `git diff-index --cached --name-only HEAD` files_mod = mod.split("\n") files_mod.each do |path| next if path.size == 0 has_file_access = false access.each do |access_path| if !access_path || (path.index(access_path) == 0) has_file_access = true end if !has_file_access puts "[POLICY] You do not have access to push to #{path}" exit 1 end end end check_directory_perms
582. prepare-commit-msg
583. commit-msg
584. #!/usr/bin/env ruby message_file = ARGV[0] message = File.read(message_file) $regex = /\[ref: (\d+)\]/ if !$regex.match(message) puts "[POLICY] Your message is not formatted correctly" exit 1 end
585. $ git commit -am 'test' [POLICY] Your message is not formatted correctly $ git commit -am 'test [ref: 132]' [master e05c914] test [ref: 132] 1 files changed, 1 insertions(+), 0 deletions(-)
586. post-commit
587. Other Local Hooks
588. pre-rebase
589. #!/usr/bin/env ruby base = ARGV[0] if ARGV[1] topic = ARGV[1] else topic = "HEAD" end target_shas = `git rev-list #{base}..#{topic}`.split("\n") remote_refs = `git branch -r`.split("\n").map { |r| r.strip } target_shas.each do |sha| remote_refs.each do |rem_ref| pushed = `git rev-list ^#{sha}^@ refs/remotes/#{rem_ref}` if pushed.split(“\n”).include?(sha) puts "[POLICY] Commit #{sha} already been pushed" exit 1 end end end
590. post-checkout
591. post-merge
592. Fun Bonus Git Internals
593. read-tree write-tree commit-tree
594. that's it!