Re: Log message printout cleanups

From: Linus Torvalds <torvalds@osdl.org>
Date: Apr 18, 2006, 00:57 UTC
Message-ID: <Pine.LNX.4.64.0604171751540.3701@g5.osdl.org>
In-Reply-To: <7v7j5nk9bf.fsf@assigned-by-dhcp.cox.net>

On Mon, 17 Apr 2006, Junio C Hamano wrote:

Show 5 quoted lines

> 
> These days I find myself running "git log --stat" more often
> than "git whatchanged"; it looks so much nicer ;-).
> 
> Thanks for a job well done.

There's actually something _wrong_ with "git log --stat".

What happens is that "git log" will enable "rev.combine_merges" by default, and that means that together with "--stat" ignoring merges by default, it will _instead_ generate a "--cc" diff for that merge.

I think that behaviour was introduced by the "--stat" code by Dscho, and not by my rewrite.

You can see it on the kernel archive on commit 88dd9c16, for example:

	git log --stat 88dd9c16

will make it pretty obvious what I'm talking about.

I still haven't looked a lot at what the diffstat code does, so I don't know what the obvious fix is. Maybe setting "ignore_merges". And maybe just making the diffstat thing do the right thing for merges.

I'll leave that up to you, I'm getting pretty fed up with "git log" right now ;)

		Linus