Merge branch 'maint'
commita6fd3d4925ca3629e7edc73a60f5e1c50c1d5390
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2011 18:39:38 +0000 (10 10:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2011 18:39:38 +0000 (10 10:39 -0800)
treeece40071cafd0fded57d4e2ad610a165ef5209ec
parent2cf08b6a0ab09f1b81b78a5686a632a2a602abf4
parent54f4cd9e8c7992f70d16efac3c6fc0a18ac0b156
Merge branch 'maint'

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