diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-04-08 13:23:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-08 13:23:26 -0700 |
| commit | 82fd285e4606b941bd2bf79be700fb0371599c18 (patch) | |
| tree | a2cd3d05f5bff362fee7cb380065e801ddfb02bf /diffcore.h | |
| parent | 22eee7f4554e777de93134c0ae06ee611bd570a4 (diff) | |
| parent | 39edfd5cbc4d168db19ec1bc867d78ec7211ec39 (diff) | |
| download | git-82fd285e4606b941bd2bf79be700fb0371599c18.tar.gz | |
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
Diffstat (limited to 'diffcore.h')
0 files changed, 0 insertions, 0 deletions