Code

Merge branch 'maint-1.7.1' into maint-1.7.2
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2011 18:39:18 +0000 (10:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2011 18:39:18 +0000 (10:39 -0800)
commit7a876edf5d5224e0755cfabb808b042f300e293d
tree66921050c562f00200bd13c014356edcd086be3d
parentb91779f17eb19ffc2e63e84728e785cf274b47df
parent567323d387dda559dbdba8c15453aba629393955
Merge branch 'maint-1.7.1' into maint-1.7.2

* maint-1.7.1:
  Documentation/githooks: post-rewrite-copy-notes never existed
  Documentation/git-archive: spell --worktree-attributes correctly