Browse Source

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>
maint
Andreas Schwab 12 years ago committed by Jeff King
parent
commit
77effefefd
  1. 7
      Documentation/git-commit.txt

7
Documentation/git-commit.txt

@ -193,10 +193,6 @@ OPTIONS @@ -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 @@ -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,

Loading…
Cancel
Save