diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-03-13 18:26:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-18 07:43:13 (GMT) |
| commit | 36b0503a19c777b57805aa26aabd77f99dbf91b7 (patch) | |
| tree | 74cec0d86e475d928c45c41f6c8e909cb5c8b213 /t/t9810-git-p4-rcs.sh | |
| parent | f59199d5faac328becafdb60507ca4c05bdd9a95 (diff) | |
| download | git-36b0503a19c777b57805aa26aabd77f99dbf91b7.zip git-36b0503a19c777b57805aa26aabd77f99dbf91b7.tar.gz git-36b0503a19c777b57805aa26aabd77f99dbf91b7.tar.bz2 | |
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 't/t9810-git-p4-rcs.sh')
0 files changed, 0 insertions, 0 deletions