From 77effefefdf95c2f08afdb5d05e947657204ccd8 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Fri, 2 Nov 2012 13:26:47 +0100 Subject: [PATCH] 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 Signed-off-by: Jeff King --- Documentation/git-commit.txt | 7 +++---- 1 file 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,