diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-20 10:14:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-20 10:14:47 -0800 |
| commit | cdcd79321390b41df452c48c5ba9d1e4cc23a801 (patch) | |
| tree | fdabf705a77dee66f21cc340558d6c0e6aa8899d | |
| parent | Merge branch 'rs/lock-correct-ref-during-delete' into maint (diff) | |
| parent | commit: fixup misplacement of --no-post-rewrite description (diff) | |
| download | git-cdcd79321390b41df452c48c5ba9d1e4cc23a801.tar.gz git-cdcd79321390b41df452c48c5ba9d1e4cc23a801.zip | |
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
| -rw-r--r-- | Documentation/git-commit.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 9594ac8e9d..28a5aeba2f 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -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, |