]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 22eee7f 39edfd5)
Merge branch 'en/sequencer-edit-upon-conflict-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 8 Apr 2021 20:23:25 +0000 (13:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Apr 2021 20:23:26 +0000 (13:23 -0700)
commit82fd285e4606b941bd2bf79be700fb0371599c18
treea2cd3d05f5bff362fee7cb380065e801ddfb02bftree | snapshot
parent22eee7f4554e777de93134c0ae06ee611bd570a4commit | diff
parent39edfd5cbc4d168db19ec1bc867d78ec7211ec39commit | diff
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
sequencer.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.