]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 36b0503) | patch
cherry-pick --continue: remember options
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Wed, 13 Mar 2019 18:26:15 +0000 (18:26 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Mar 2019 07:43:13 +0000 (16:43 +0900)
commit6860ce5d8e461e5997029abe73c39590d349cef9
tree92be4811146b93c1665c16d69430d21e45cd571dtree | snapshot
parent36b0503a19c777b57805aa26aabd77f99dbf91b7commit | diff
cherry-pick --continue: remember options

Remember --allow-empty, --allow-empty-message and
--keep-redundant-commits when cherry-pick stops for a conflict
resolution.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c diff | blob | blame | history
t/t3507-cherry-pick-conflict.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.