From: Phillip Wood <phillip.wood@dunelm.org.uk>
Date: Wed, 13 Mar 2019 18:26:14 +0000 (+0000)
Subject: cherry-pick: demonstrate option amnesia
X-Git-Tag: v2.22.0-rc0~68^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/36b0503a19c777b57805aa26aabd77f99dbf91b7?hp=36b0503a19c777b57805aa26aabd77f99dbf91b7

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>
---