diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-03-13 18:26:15 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-03-18 16:43:13 +0900 |
| commit | 6860ce5d8e461e5997029abe73c39590d349cef9 (patch) | |
| tree | 92be4811146b93c1665c16d69430d21e45cd571d /contrib/update-unicode/.gitignore | |
| parent | cherry-pick: demonstrate option amnesia (diff) | |
| download | tgif-6860ce5d8e461e5997029abe73c39590d349cef9.tar.xz | |
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 'contrib/update-unicode/.gitignore')
0 files changed, 0 insertions, 0 deletions