Merge branch 'maint-1.7.2' into maint
commit54f4cd9e8c7992f70d16efac3c6fc0a18ac0b156
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2011 18:39:28 +0000 (10 10:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2011 18:39:28 +0000 (10 10:39 -0800)
treef7f05586cc347037edfb8ee7decf551fb2fc8b9e
parentb393515f8ef43d5e873502dd80205233933389a1
parent7a876edf5d5224e0755cfabb808b042f300e293d
Merge branch 'maint-1.7.2' into maint

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