Andrew's git / gitweb.git / diff
?
Merge branch 'maint-1.7.2' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2011 18:39:28 +0000 (10:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2011 18:39:28 +0000 (10:39 -0800)
* maint-1.7.2:
Documentation/githooks: post-rewrite-copy-notes never existed
Documentation/git-archive: spell --worktree-attributes correctly

1  2 
Documentation/git-archive.txt patch | diff1 | diff2 | blob | history
diff --cc Documentation/git-archive.txt
Simple merge