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

* as/maint-doc-fix-no-post-rewrite:
  commit: fixup misplacement of --no-post-rewrite description
This commit is contained in:
Junio C Hamano 2012-11-15 10:24:29 -08:00
commit 80b2234e9b

View File

@ -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:
@ -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,