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.6.1~3^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/567323d387dda559dbdba8c15453aba629393955?ds=inline;hp=--cc

Merge branch 'maint-1.7.0' into maint-1.7.1

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

567323d387dda559dbdba8c15453aba629393955