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

Documentation/git-commit.txt
index 0295890621117ae3981485eec5872d3dcfb23af6..b620aae411499170c63b92f1c7e80793fcc0de5b 100644 (file)
@@ -197,10 +197,6 @@ OPTIONS
        current tip -- if it was a merge, it will have the parents of
        the current tip as parents -- so the current top commit is
        discarded.
-
---no-post-rewrite::
-       Bypass the post-rewrite hook.
-
 +
 --
 It is a rough equivalent for:
@@ -217,6 +213,9 @@ You should understand the implications of rewriting history if you
 amend a commit that has already been published.  (See the "RECOVERING
 FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].)
 
+--no-post-rewrite::
+       Bypass the post-rewrite hook.
+
 -i::
 --include::
        Before making a commit out of staged contents so far,