Linus Torvalds <torvalds@xxxxxxxx> writes: > I suspect it would be better to just have the _first_ > diffstat, and always make the merge diffstat be the one for "result > against first parent". > > I realize that Dscho has been looking at some much "fancier" merge > diffstats, but I really do believe that the "what got merged" difference > to the original branch (ie parent 1) is what you want in practice. > > Anyway, that's a totally separate issue, I'll let you guys fight that out. I agree with your opinion 100% from usability point of view, although I admit one of the fancier format was suggested by me. Showing stat from the first parent makes --stat inconsistent from what the "fake diff" shows, but I think it is a sensible thing to do. The purpose of two are different in that (1) stat is a way to see the extent of damage to what you had before you merged, and (2) --cc is a way to see how complex the merge was, to spot obvious merge mistakes and sanity check the merge at the contents level. - : 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