From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Jan 2011 18:39:28 +0000 (-0800)
Subject: Merge branch 'maint-1.7.2' into maint
X-Git-Tag: v1.7.4-rc2~13^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=54f4cd9e8c7992f70d16efac3c6fc0a18ac0b156;p=thirdparty%2Fgit.git

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
---

54f4cd9e8c7992f70d16efac3c6fc0a18ac0b156