From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Jan 2011 18:39:38 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.4-rc2~13
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a6fd3d4925ca3629e7edc73a60f5e1c50c1d5390?ds=inline;hp=--cc

Merge branch 'maint'

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

a6fd3d4925ca3629e7edc73a60f5e1c50c1d5390