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 /t/t4018/cpp-class-definition | |
| parent | Merge branch 'll/clone-reject-shallow' (diff) | |
| parent | sequencer: fix edit handling for cherry-pick and revert messages (diff) | |
| download | tgif-82fd285e4606b941bd2bf79be700fb0371599c18.tar.xz | |
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 't/t4018/cpp-class-definition')
0 files changed, 0 insertions, 0 deletions