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

From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Jan 13, 2012, 19:49 UTC
Message-ID: <CA+55aFxw_-0h1FDmPRVif3LM03Qh3-6haA7=KYbae8pSFbpW2w@mail.gmail.com>
In-Reply-To: <CACsJy8BmFgssTAh=1U7JgBsGG-tSaWXQzZeODND3icXY3QUxug@mail.gmail.com>

On Fri, Jan 13, 2012 at 11:27 AM, Nguyen Thai Ngoc Duy <pclouds@gmail.com> wrote:

Show 5 quoted lines

>
> 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.

                  Linus