On Sat, Apr 16, 2011 at 12:33 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > I suspect Jay had the recent CHERRY_PICK_HEAD series that lets you omit > saying "-c <picked>" in mind. Correct. > ÂWe should not leave the cherry-picked from > in such a case, I think, but the new code may be buggy. Disagree. Here was my thought process (it was a conscious decision): after conflict, when the user runs "git commit", the message is brought up in the editor, leaving it up to the user to decide whether it is appropriate to remove the "cherry-picked from" message. I personally think it is correct to keept it, along with the list of "Conflicts:". I understand some users think it's not appropriate to keep the "cherry-picked from" message, but git should not force the decision. j. -- 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