public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Adrian Bunk <bunk@stusta.de>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Jeff Garzik <jeff@garzik.org>, Andrew Morton <akpm@osdl.org>,
	LKML <linux-kernel@vger.kernel.org>,
	junkio@cox.net
Subject: git diff <-> diffstat
Date: Mon, 25 Sep 2006 03:14:36 +0200	[thread overview]
Message-ID: <20060925011436.GC4547@stusta.de> (raw)
In-Reply-To: <Pine.LNX.4.64.0609241732580.3952@g5.osdl.org>

On Sun, Sep 24, 2006 at 05:34:05PM -0700, Linus Torvalds wrote:
> 
> 
> On Sun, 24 Sep 2006, Jeff Garzik wrote:
> > 
> > Right now I just pipe 'git diff master..branch' to diffstat.
> 
> Ok. That just means that you can change it do say
> 
> 	git diff -M --stat --summary master..branch
> 
> and you get exactly what you need. No need for a separate diffstat at all, 
> and you get all the renaming and summary printout.

Is there any way for "git diff" to handle additional options diffstat 
handles? I'm a big fan of the -w72 diffstat option.

Oh, and with git 1.4.2.1,
  git diff -M --stat --summary v2.6.18..master
in your tree gives me some funny lines like:

 .../netlabel/draft-ietf-cipso-ipsecurity-01.txt    |  791 +
 .../{cpu_setup_power4.S => cpu_setup_ppc970.S}     |  103 
 .../powerpc/platforms}/iseries/it_exp_vpd_panel.h  |    6 
 .../powerpc/platforms}/iseries/it_lp_naca.h        |    6 

I don't know what's going wrong here, but diffstat doesn't produce this.

> 		Linus

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed


  reply	other threads:[~2006-09-25  1:14 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-09-24 16:18 [git patch] add and use include/linux/magic.h Jeff Garzik
2006-09-24 17:08 ` Linus Torvalds
2006-09-25  0:28   ` Jeff Garzik
2006-09-25  0:34     ` Linus Torvalds
2006-09-25  1:14       ` Adrian Bunk [this message]
2006-09-25  2:05         ` git diff <-> diffstat Linus Torvalds
2006-09-25  2:22           ` Adrian Bunk
2006-09-25  2:55             ` Linus Torvalds
2006-09-25  6:17               ` Jan Engelhardt
2006-09-26 22:04           ` Junio C Hamano
2006-09-25  2:18         ` Junio C Hamano

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=20060925011436.GC4547@stusta.de \
    --to=bunk@stusta.de \
    --cc=akpm@osdl.org \
    --cc=jeff@garzik.org \
    --cc=junkio@cox.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@osdl.org \
    /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