]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f59199d) | patch
cherry-pick: demonstrate option amnesia
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Wed, 13 Mar 2019 18:26:14 +0000 (18:26 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Mar 2019 07:43:13 +0000 (16:43 +0900)
commit36b0503a19c777b57805aa26aabd77f99dbf91b7
tree74cec0d86e475d928c45c41f6c8e909cb5c8b213tree | snapshot
parentf59199d5faac328becafdb60507ca4c05bdd9a95commit | diff
cherry-pick: demonstrate option amnesia

When cherry-pick stops for a conflict resolution it forgets
--allow-empty --allow-empty-message and --keep-redundant-commits.

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