From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Jan 2011 18:39:04 +0000 (-0800)
Subject: Merge branch 'maint-1.7.0' into maint-1.7.1
X-Git-Tag: v1.7.4-rc2~11^2~1^2^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=567323d387dda559dbdba8c15453aba629393955;p=git.git

Merge branch 'maint-1.7.0' into maint-1.7.1

* maint-1.7.0:
  Documentation/git-archive: spell --worktree-attributes correctly
---

567323d387dda559dbdba8c15453aba629393955