| commit | d2dba18ced8e4939a3cd135998c54874ce73adc1 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 25 Apr 2019 07:41:13 +0000 (25 16:41 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 25 Apr 2019 07:41:14 +0000 (25 16:41 +0900) | ||
| tree | 471a1a30c2d3d5c70f7b8ec46ea93cbab3dfc0a8 | treesnapshot (tar.gz zip) |
| parent | e313c768e0daf78da2d9e23967dc6625e9db0837 | commitdiff |
| parent | 6860ce5d8e461e5997029abe73c39590d349cef9 | commitdiff |
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
"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
| sequencer.c | diff1 | diff2 | blobhistory |