commit: fixup misplacement of --no-post-rewrite description
In e858af6 (commit: document a couple of options) the description of the --no-post-rewrite option was put inside the paragraph for the --amend option. Move it down after the paragraph. Signed-off-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: Jeff King <peff@peff.net>
Andreas Schwab committed
Nov 2, 2012 at 13:26 UTC
77effefefdf95c2f08afdb5d05e947657204ccd8
1 file changed
+3
-4
Documentation/git-commit.txt
+3
-4
@@ -193,10 +193,6 @@ OPTIONS
193
current tip -- if it was a merge, it will have the parents of
194
the current tip as parents -- so the current top commit is
195
discarded.
196
-
197
---no-post-rewrite::
198
- Bypass the post-rewrite hook.
199
-
196
+
197
--
198
It is a rough equivalent for:
@@ -213,6 +209,9 @@ You should understand the implications of rewriting history if you
209
amend a commit that has already been published. (See the "RECOVERING
210
FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].)
211
212
+--no-post-rewrite::
213
+ Bypass the post-rewrite hook.
214
+
215
-i::
216
--include::
217
Before making a commit out of staged contents so far,