From 1a2b985fb375e7ce14932bfc59365024af2fb6ab Mon Sep 17 00:00:00 2001 From: Denton Liu Date: Wed, 17 Apr 2019 11:23:30 +0100 Subject: cherry-pick/revert: add scissors line on merge conflict Fix a bug where the scissors line is placed after the Conflicts: section, in the case where a merge conflict occurs and commit.cleanup = scissors. Helped-by: Phillip Wood Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano --- Documentation/git-revert.txt | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Documentation/git-revert.txt') diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt index 6afccb2f1e..0c82ca5bc0 100644 --- a/Documentation/git-revert.txt +++ b/Documentation/git-revert.txt @@ -66,6 +66,13 @@ more details. With this option, 'git revert' will not start the commit message editor. +--cleanup=:: + This option determines how the commit message will be cleaned up before + being passed on to the commit machinery. See linkgit:git-commit[1] for more + details. In particular, if the '' is given a value of `scissors`, + scissors will be appended to `MERGE_MSG` before being passed on in the case + of a conflict. + -n:: --no-commit:: Usually the command automatically creates some commits with -- cgit v1.2.3