Skip to content

Commit

Permalink
Merge branch 'as/maint-doc-fix-no-post-rewrite'
Browse files Browse the repository at this point in the history
* as/maint-doc-fix-no-post-rewrite:
  commit: fixup misplacement of --no-post-rewrite description
  • Loading branch information
Junio C Hamano committed Nov 15, 2012
2 parents 1f0335a + 77effef commit 80b2234
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 @@ -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:
Expand All @@ -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,
Expand Down

0 comments on commit 80b2234

Please sign in to comment.