On Sat, Apr 05, 2008 at 11:51:51AM -0700, Junio C Hamano wrote: > I'd favor, in the longer run: > > * --stat option to mean "show the diffstat between ORIG_HEAD and merge > result" (i.e. current --summary); > > * perhaps a new configuration merge.stat to control the default for the > above; > > * merge.log configuration to mean "add list of one-line log to the merge > commit message" (i.e. current merge.summary); > > * perhaps a --log option to override the config default for each > invocation. > > * deprecate --summary and merge.summary and remove them long after people > are used to the above new set. I'll add a belated "yes I agree" to this. This is what I was trying to describe earlier in the thread, but for some reason couldn't think of the obvious name "log" to replace merge.summary. :) -Peff -- 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