On Friday, May 25, 2012 11:20:10 am Linus Torvalds wrote: > On Fri, May 25, 2012 at 10:05 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > >> Btw, I'd also like to see the merge notes (notably the > >> conflict file list) before the generated shortlog, > >> but that seems to really not work with the current > >> fmt-merge-message model. Oh well. > > > Yes. Right now, the conflict line is hidden way at the > bottom, and I've actually overlooked it several times > (and I don't think I'm the only one - do "git log > --grep=Conflicts:" on the kernel tree and you'll see a > lot of people just leaving them be). Tangentially related, I think that in the cherry-pick case this can also be a problem. Not exactly the same, but in the cherry-pick case you are generally starting with an existing commit message, and the location of the conflicts at the bottom ends up actually causing functional problems for the interpretations of the old "footer-lines" by some tools. Notably, our users sometimes cherry-pick gerrit changes but then the old Change-Id footer line gets placed above the conflicts and if they forget to remove the conflicts, the Change-Id footer is not recognized by Gerrit. So, not only are users forgetting to remove the conflicts, it causes tooling problems in the cherry-pick case by messing with the footer layouts, -Martin -- Employee of Qualcomm Innovation Center, Inc. which is a member of Code Aurora Forum -- 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