• Junio C Hamano's avatar
    Merge branch 'pw/cherry-pick-continue' · d2dba18c
    Junio C Hamano authored
    "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 137 KB