Yann Dirson <dirson@xxxxxxxxx> writes: > (only tested with 1.7.10.x for now) > > ~/softs/linux$ echo foo > .git/COMMIT_EDITMSG Why are you mucking with such an internal implementation detail in the first place? > ~/softs/linux$ git cherry-pick -n b55f3d92cd > error: could not apply b55f3d9... Linux 2.6.32.26 > hint: after resolving the conflicts, mark the corrected paths > hint: with 'git add <paths>' or 'git rm <paths>' > ~/softs/linux$ cat .git/COMMIT_EDITMSG > foo > > So far, so good. But then "git commit" brings me the message from the > cherry-picked commit plus the list of conflicted files, and I can verify that > it is now the contents of .git/COMMIT_EDITMSG. You verified that "what" is now in .git/COMMIT_EDITMSG? The commit log message for you to edit to record the result of the cherry-pick? If that is the case, what is the problem? If anything you had in .git/COMMIT_EDITMSG before you started "'cherry-pick -n', edit further to adjust, and then 'commit'" sequence were to appear in the editor to edit the commit log, it would be a bug, I would think. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html