Antoine Pelisse <apelisse@xxxxxxxxx> writes: > Subject: Re: [PATCH] diff: Fixes shortstat number of files Please replace "Fixes" with "Fix at least (because our log messages are written as if a patch is giving an order to the codebase, iow, in imperative mood), but we would prefer to see a concrete description on what is fixed, when we can. And in this case, I think we can, perhaps: diff: do not count unmerged paths twice in --shortstat/--numstat or something. > There is a discrepancy between the last line of `git diff --stat` > and `git diff --shortstat` in case of a merge. > The unmerged files are actually counted twice, thus doubling the > value of "file changed". I think the current 'master' and upward is broken with respect to this; I am consistently getting two entries for unmerged paths across --stat, --shortstat and --numstat options (iow, not just shortstat and numstat but the '--stat' seems to be broken as well). Thanks. -- 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