From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Apr 2019 07:41:13 +0000 (+0900)
Subject: Merge branch 'pw/cherry-pick-continue'
X-Git-Tag: v2.22.0-rc0~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d2dba18ced8e4939a3cd135998c54874ce73adc1;p=git

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
---

d2dba18ced8e4939a3cd135998c54874ce73adc1