undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 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-20 10:14:46 -08:00
commit cdcd793213
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/git-commit.txt
View File

@ -193,10 +193,6 @@ OPTIONS
current tip -- if it was a merge, it will have the parents of current tip -- if it was a merge, it will have the parents of
the current tip as parents -- so the current top commit is the current tip as parents -- so the current top commit is
discarded. discarded.
--no-post-rewrite::
Bypass the post-rewrite hook.
+ +
-- --
It is a rough equivalent for: 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 amend a commit that has already been published. (See the "RECOVERING
FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].) FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].)
--no-post-rewrite::
Bypass the post-rewrite hook.
-i:: -i::
--include:: --include::
Before making a commit out of staged contents so far, Before making a commit out of staged contents so far,