Junio C Hamano d2dba18ced 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

2019-04-25 16:41:14 +09:00

137 KiB

Raw Blame History

View Raw