summaryrefslogtreecommitdiffstats
path: root/sha1-lookup.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-09 05:12:44 +0200
committerJunio C Hamano <gitster@pobox.com>2008-05-09 05:12:44 +0200
commit32a27b56662b1c7aa13f98c95f170ba5290c7559 (patch)
treeb7a5665ff852003e2a4a595c98734cdb5ab8bf0d /sha1-lookup.c
parentMerge branch 'maint-1.5.4' into maint (diff)
parentDocumentation/config.txt: Mention branch.<name>.rebase applies to "git pull" (diff)
downloadgit-32a27b56662b1c7aa13f98c95f170ba5290c7559.tar.xz
git-32a27b56662b1c7aa13f98c95f170ba5290c7559.zip
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4: Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull" doc: clarify definition of "update" for git-add -u
Diffstat (limited to 'sha1-lookup.c')
0 files changed, 0 insertions, 0 deletions