summaryrefslogtreecommitdiff
path: root/t/t4101
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-04-08 13:23:25 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-04-08 13:23:26 -0700
commit82fd285e4606b941bd2bf79be700fb0371599c18 (patch)
treea2cd3d05f5bff362fee7cb380065e801ddfb02bf /t/t4101
parentMerge branch 'll/clone-reject-shallow' (diff)
parentsequencer: fix edit handling for cherry-pick and revert messages (diff)
downloadtgif-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/t4101')
0 files changed, 0 insertions, 0 deletions