Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2011 18:39:38 +0000 (10:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2011 18:39:38 +0000 (10:39 -0800)
* maint:
  Documentation/githooks: post-rewrite-copy-notes never existed
  Documentation/git-archive: spell --worktree-attributes correctly


Trivial merge