git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Arnaud Lacombe <lacombar@gmail.com>
Date
Jan 27, 2012, 03:24 UTC
Message-ID
<CACqU3MURpHyQZMWVJ_H9xQdbn7RCiv2e2HLK7uCC-VjQ9rQL9g@mail.gmail.com>
Hi,

On Fri, Jan 13, 2012 at 2:49 PM, Linus Torvalds <torvalds@linux-foundation.org> wrote:

Show 27 quoted lines
> On Fri, Jan 13, 2012 at 11:27 AM, Nguyen Thai Ngoc Duy
> <pclouds@gmail.com> wrote:
>>
>> 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
Show 5 quoted lines
>                  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
Message 1 of 1 in “Dynamic diff [Was: Re: [PATCH] merge: Make merge strategy message follow the diffstat]”
  1. Arnaud LacombeJan 27, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.