git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e313c76 6860ce5)
Merge branch 'pw/cherry-pick-continue'
authorJunio C Hamano <redacted>
Thu, 25 Apr 2019 07:41:13 +0000 (16:41 +0900)
committerJunio C Hamano <redacted>
Thu, 25 Apr 2019 07:41:14 +0000 (16:41 +0900)
commitd2dba18ced8e4939a3cd135998c54874ce73adc1
tree471a1a30c2d3d5c70f7b8ec46ea93cbab3dfc0a8tree | snapshot
parente313c768e0daf78da2d9e23967dc6625e9db0837commit | diff
parent6860ce5d8e461e5997029abe73c39590d349cef9commit | diff
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
sequencer.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT