Andrew's git / gitweb.git / diff
?
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)
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>
No differences found