{"thread":{"id":"29450","subject":"Dynamic diff [Was: Re: [PATCH] merge: Make merge strategy message follow the diffstat]","startedAt":"2012-01-27T03:24:52Z","lastAt":"2012-01-27T03:24:52Z","messageCount":1,"participants":["Arnaud Lacombe"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"183153","messageId":"CACqU3MURpHyQZMWVJ_H9xQdbn7RCiv2e2HLK7uCC-VjQ9rQL9g@mail.gmail.com","threadId":"29450","inReplyTo":null,"subject":"Dynamic diff [Was: Re: [PATCH] merge: Make merge strategy message follow the diffstat]","fromName":"Arnaud Lacombe","fromEmail":"lacombar@gmail.com","sentAt":"2012-01-27T03:24:52Z","receivedAt":"2012-01-27T03:24:52Z","isPatch":true,"sender":{"key":"lacombar@gmail.com","avatar":"https://gravatar.com/avatar/411d40b6ba69fff936664b1ff7cff65f3ca23f236700f0f0d0313b6b43abd344?d=mp&s=160"},"body":"Hi,\n\nOn Fri, Jan 13, 2012 at 2:49 PM, Linus Torvalds\n<torvalds@linux-foundation.org> wrote:\n> On Fri, Jan 13, 2012 at 11:27 AM, Nguyen Thai Ngoc Duy\n> <pclouds@gmail.com> wrote:\n>>\n>> Still, diffstat from a fetch/pull is sometimes too verbose. It'd be\n>> better if we have something that fit in one screen (dirstat or maybe\n>> just a first few lines from diffstat then ellipsis) then refer users\n>> to \"git diff --stat HEAD@{1}\" for more detail stat.\n>\n> Yeah, I've wanted that. Show the beginning, the end, and the summary\n> line of the diffstat would be lovely.\n>\n> It would be lovely in \"git commit\" too. Not just\n>\n>    Modified: filename\n>\n> but a diffstat that shows now many lines.\n>\n> And what I've *really* wanted is to actually see the diff itself if it\n> is small. So some kind of \"dynamic summary\": for one-liners (or\n> ten-liners), show the whole diff. For medium-sized changes, show the\n> whole diffstat. And for really big changes, show an outline and the\n> \"768 files changed, 179851 lines added, 7630 lines removed\" stats.\n>\n> IOW, whatever fits in, say, 50 lines or less.\n>\n> That would be absolutely lovely if somebody were to do it.\n>\nsomething like:\n\nhttps://github.com/lacombar/git/commit/3d90830fc8730e4f0cad9974070c6e9241797489\n\n?\n\nI'm still not a huge fan of having the `shortstat' before the\ncumulative `dirstat', and still have some trouble wiring correctly the\nthresholds.\n\n - Arnaud\n\n>                  Linus\n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n"}]}