diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-15 19:24:29 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-15 19:24:29 +0100 |
| commit | 80b2234e9b3991a8e4ac729b985d2d245de98d8e (patch) | |
| tree | c108bb9b4331083279b879b98404aa546c789f07 /Documentation/git-commit.txt | |
| parent | Merge branch 'js/hp-nonstop' (diff) | |
| parent | commit: fixup misplacement of --no-post-rewrite description (diff) | |
| download | git-80b2234e9b3991a8e4ac729b985d2d245de98d8e.tar.xz git-80b2234e9b3991a8e4ac729b985d2d245de98d8e.zip | |
Merge branch 'as/maint-doc-fix-no-post-rewrite'
* as/maint-doc-fix-no-post-rewrite:
commit: fixup misplacement of --no-post-rewrite description
Diffstat (limited to 'Documentation/git-commit.txt')
| -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 0295890621..b620aae411 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -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, |