git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@osdl.org>
To: Junio C Hamano <junkio@cox.net>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: Re: Log message printout cleanups
Date: Mon, 17 Apr 2006 17:57:20 -0700 (PDT)	[thread overview]
Message-ID: <Pine.LNX.4.64.0604171751540.3701@g5.osdl.org> (raw)
In-Reply-To: <7v7j5nk9bf.fsf@assigned-by-dhcp.cox.net>



On Mon, 17 Apr 2006, Junio C Hamano wrote:
> 
> 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

  reply	other threads:[~2006-04-18  0:57 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-04-16 22:17 Fixes for option parsing Linus Torvalds
2006-04-17  0:29 ` Junio C Hamano
2006-04-17  2:42   ` Linus Torvalds
2006-04-17  3:03     ` Linus Torvalds
2006-04-17  3:36     ` Junio C Hamano
2006-04-17 14:51       ` Linus Torvalds
2006-04-17 18:59   ` Log message printout cleanups Linus Torvalds
2006-04-17 22:45     ` Junio C Hamano
2006-04-17 23:59       ` Linus Torvalds
2006-04-18  0:22         ` Junio C Hamano
2006-04-18  0:37           ` Junio C Hamano
2006-04-18  0:57             ` Linus Torvalds [this message]
2006-04-18  5:52               ` Junio C Hamano
2006-04-18 15:37                 ` Linus Torvalds
2006-04-18 16:06                   ` Linus Torvalds
2006-04-18 16:48                     ` Junio C Hamano
2006-04-18 18:33                     ` [PATCH] diff --stat: make sure to set recursive Junio C Hamano
2006-04-18  0:43           ` Log message printout cleanups Linus Torvalds

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Pine.LNX.4.64.0604171751540.3701@g5.osdl.org \
    --to=torvalds@osdl.org \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).