diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-03-13 18:26:14 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-03-18 16:43:13 +0900 |
| commit | 36b0503a19c777b57805aa26aabd77f99dbf91b7 (patch) | |
| tree | 74cec0d86e475d928c45c41f6c8e909cb5c8b213 /contrib/update-unicode/.gitignore | |
| parent | sequencer: break some long lines (diff) | |
| download | tgif-36b0503a19c777b57805aa26aabd77f99dbf91b7.tar.xz | |
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>
Diffstat (limited to 'contrib/update-unicode/.gitignore')
0 files changed, 0 insertions, 0 deletions