diff options
| author |  Andreas Schwab <schwab@linux-m68k.org> | 2012-11-02 13:26:47 +0100 |
|---|---|---|
| committer |  Jeff King <peff@peff.net> | 2012-11-02 09:22:02 -0400 |
| commit | 77effefefdf95c2f08afdb5d05e947657204ccd8 (patch) | |
| tree | e9a496a001dfea2dc1793c4c5cb6113b9b2c9e9f | |
| parent | commit: document a couple of options (diff) | |
| download | tgif-77effefefdf95c2f08afdb5d05e947657204ccd8.tar.xz | |
commit: fixup misplacement of --no-post-rewrite description
In e858af6 (commit: document a couple of options) the description of the
--no-post-rewrite option was put inside the paragraph for the --amend
option. Move it down after the paragraph.
Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Jeff King <peff@peff.net>
| -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 441c2087b9..9e327cf5c0 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, |