From: Phillip Wood <phillip.wood@dunelm.org.uk>
Date: Wed, 13 Mar 2019 18:26:15 +0000 (+0000)
Subject: cherry-pick --continue: remember options
X-Git-Tag: v2.22.0-rc0~68^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6860ce5d8e461e5997029abe73c39590d349cef9?hp=6860ce5d8e461e5997029abe73c39590d349cef9

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