Andrew's git / gitweb.git / diff
?
Merge branch 'nd/cherry-pick-quit-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Aug 2018 19:41:34 +0000 (12:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Aug 2018 19:41:34 +0000 (12:41 -0700)
"git cherry-pick --quit" failed to remove CHERRY_PICK_HEAD even
though we won't be in a cherry-pick session after it returns, which
has been corrected.

* nd/cherry-pick-quit-fix:
cherry-pick: fix --quit not deleting CHERRY_PICK_HEAD

1  2 
builtin/revert.c patch | diff1 | diff2 | blob | history
t/t3510-cherry-pick-sequence.sh patch | diff1 | diff2 | blob | history
diff --cc builtin/revert.c
Simple merge
diff --cc t/t3510-cherry-pick-sequence.sh
Simple merge