diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-03-13 18:26:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-18 07:43:13 (GMT) |
| commit | 6860ce5d8e461e5997029abe73c39590d349cef9 (patch) | |
| tree | 92be4811146b93c1665c16d69430d21e45cd571d /t/t6200-fmt-merge-msg.sh | |
| parent | 36b0503a19c777b57805aa26aabd77f99dbf91b7 (diff) | |
| download | git-6860ce5d8e461e5997029abe73c39590d349cef9.zip git-6860ce5d8e461e5997029abe73c39590d349cef9.tar.gz git-6860ce5d8e461e5997029abe73c39590d349cef9.tar.bz2 | |
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>
Diffstat (limited to 't/t6200-fmt-merge-msg.sh')
0 files changed, 0 insertions, 0 deletions