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

Merge branch 'maint-1.7.1' into maint-1.7.2

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

7a876edf5d5224e0755cfabb808b042f300e293d