mirror of
https://github.com/git/git.git
synced 2024-11-24 18:33:43 +08:00
Merge branch 'as/maint-doc-fix-no-post-rewrite' into maint
* as/maint-doc-fix-no-post-rewrite: commit: fixup misplacement of --no-post-rewrite description
This commit is contained in:
commit
cdcd793213
@ -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
|
||||
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…
Reference in New Issue
Block a user