Junio C Hamano 82fd285e46 Merge branch 'en/sequencer-edit-upon-conflict-fix' ...

"git cherry-pick/revert" with or without "--[no-]edit" did not spawn
the editor as expected (e.g. "revert --no-edit" after a conflict
still asked to edit the message), which has been corrected.

* en/sequencer-edit-upon-conflict-fix:
  sequencer: fix edit handling for cherry-pick and revert messages

2021-04-08 13:23:26 -07:00

162 KiB

Raw Blame History

View Raw