Skip to content

Commit

Permalink
commit: fixup misplacement of --no-post-rewrite description
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andreas Schwab authored and Jeff King committed Nov 2, 2012
1 parent e858af6 commit 77effef
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions Documentation/git-commit.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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,
Expand Down

0 comments on commit 77effef

Please sign in to comment.