Merge branch 'as/maint-doc-fix-no-post-rewrite' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Nov 2012 18:14:46 +0000 (10:14 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Nov 2012 18:14:47 +0000 (10:14 -0800)
* as/maint-doc-fix-no-post-rewrite:
commit: fixup misplacement of --no-post-rewrite description

1  2 
Documentation/git-commit.txt
Simple merge