Dynamic diff [Was: Re: [PATCH] merge: Make merge strategy message follow the diffstat]

Hi,

On Fri, Jan 13, 2012 at 2:49 PM, Linus Torvalds
[off-list ref] wrote:

On Fri, Jan 13, 2012 at 11:27 AM, Nguyen Thai Ngoc Duy
[off-list ref] wrote:

quoted

Still, diffstat from a fetch/pull is sometimes too verbose. It'd be
better if we have something that fit in one screen (dirstat or maybe
just a first few lines from diffstat then ellipsis) then refer users
to "git diff --stat HEAD@{1}" for more detail stat.

Yeah, I've wanted that. Show the beginning, the end, and the summary
line of the diffstat would be lovely.

It would be lovely in "git commit" too. Not just

   Modified: filename

but a diffstat that shows now many lines.

And what I've *really* wanted is to actually see the diff itself if it
is small. So some kind of "dynamic summary": for one-liners (or
ten-liners), show the whole diff. For medium-sized changes, show the
whole diffstat. And for really big changes, show an outline and the
"768 files changed, 179851 lines added, 7630 lines removed" stats.

IOW, whatever fits in, say, 50 lines or less.

That would be absolutely lovely if somebody were to do it.

something like:

https://github.com/lacombar/git/commit/3d90830fc8730e4f0cad9974070c6e9241797489

?

I'm still not a huge fan of having the `shortstat' before the
cumulative `dirstat', and still have some trouble wiring correctly the
thresholds.

 - Arnaud

                 Linus
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html