diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-04-25 16:41:13 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-25 16:41:14 +0900 |
| commit | d2dba18ced8e4939a3cd135998c54874ce73adc1 (patch) | |
| tree | 471a1a30c2d3d5c70f7b8ec46ea93cbab3dfc0a8 /xdiff-interface.h | |
| parent | Merge branch 'nd/commit-a-with-paths-msg-update' (diff) | |
| parent | cherry-pick --continue: remember options (diff) | |
| download | tgif-d2dba18ced8e4939a3cd135998c54874ce73adc1.tar.xz | |
Merge branch 'pw/cherry-pick-continue'
"git cherry-pick --options A..B", after giving control back to the
user to ask help resolving a conflicted step, did not honor the
options it originally received, which has been corrected.
* pw/cherry-pick-continue:
cherry-pick --continue: remember options
cherry-pick: demonstrate option amnesia
sequencer: break some long lines
Diffstat (limited to 'xdiff-interface.h')
0 files changed, 0 insertions, 0 deletions