Andrew's git / gitweb.git / diff
?
Merge branch 'maint-1.7.0' into maint-1.7.1
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2011 18:39:04 +0000 (10:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2011 18:39:04 +0000 (10:39 -0800)
* maint-1.7.0:
Documentation/git-archive: spell --worktree-attributes correctly

Trivial merge