]> git.ipfire.org Git - thirdparty/git.git/commit - sequencer.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: dc42e9a) | patch
cherry-pick/revert: add scissors line on merge conflict
authorDenton Liu <liu.denton@gmail.com>
Wed, 17 Apr 2019 10:23:30 +0000 (11:23 +0100)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Apr 2019 03:05:36 +0000 (12:05 +0900)
commit1a2b985fb375e7ce14932bfc59365024af2fb6ab
tree037601e08fa0b4b958b8342b77f991c75799ca97tree | snapshot
parentdc42e9a83a9e9206566b6bc9b57f431b98682b29commit | diff
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 <phillip.wood@dunelm.org.uk>
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-cherry-pick.txt diff | blob | blame | history
Documentation/git-revert.txt diff | blob | blame | history
builtin/merge.c diff | blob | blame | history
builtin/revert.c diff | blob | blame | history
sequencer.c diff | blob | blame | history
sequencer.h diff | blob | blame | history
t/t3507-cherry-pick-conflict.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.