From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 20 Nov 2012 18:14:46 +0000 (-0800)
Subject: Merge branch 'as/maint-doc-fix-no-post-rewrite' into maint
X-Git-Tag: v1.8.0.1~8
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/cdcd79321390b41df452c48c5ba9d1e4cc23a801?hp=c5afc5b73e33e47537936ef4bb738c9d8e2f1963

Merge branch 'as/maint-doc-fix-no-post-rewrite' into maint

* as/maint-doc-fix-no-post-rewrite:
commit: fixup misplacement of --no-post-rewrite description
---

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 9594ac8e9d..28a5aeba2f 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -193,10 +193,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:
@@ -213,6 +209,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,