Merge branch 'maint-1.7.0' into maint-1.7.1
commit567323d387dda559dbdba8c15453aba629393955
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2011 18:39:04 +0000 (10 10:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2011 18:39:04 +0000 (10 10:39 -0800)
tree176085ab5fc95105a53a6bb631e1a0aeecf9da9a
parent920a5d436b0309072de598a44b493ba0793b074c
parentfc7642a096b99295a636ebde03e4b951a7da9c5a
Merge branch 'maint-1.7.0' into maint-1.7.1

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