commit: fixup misplacement of --no-post-rewrite description
PATCH 1/1 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 <[email protected]>
--- Documentation/git-commit.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
Documentation/git-commit.txt +3 -4
@@ -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,
Signature · 7 lines
1.8.0 -- Andreas Schwab, [email protected] GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."
Quoted 5 lines · Andreas Schwab
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 <[email protected]>
Thanks, the modified output looks much more sane.
-Peff