From: Stefan Richter <stefanr@s5r6.in-berlin.de>
To: Greg KH <greg@kroah.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org
Subject: Re: [GIT PATCH] STAGING merge for .36
Date: Sat, 07 Aug 2010 01:05:16 +0200 [thread overview]
Message-ID: <4C5C952C.6070408@s5r6.in-berlin.de> (raw)
In-Reply-To: <20100806184149.GA23308@kroah.com>
Greg KH wrote:
> git diff -M --stat --summary origin..HEAD
>
> That's what I've been doing for a while now, and it has been working for
> the other trees.
>
> This one was a bit different in that I did have to pull from a different
> tree for one of the drivers, but that merged together nicely from what
> the end result looked like.
/If/ that other tree is not a true descendant of origin, then
git diff -M --stat --summary origin...HEAD
^^^
shows something else than the .. variant. Somebody who pulls HEAD into
a tree that contains origin sees a diffstat from git pull like with from
the ... variant of git diff --stat, I think.
--
Stefan Richter
-=====-==-=- =--- --===
http://arcgraph.de/sr/
prev parent reply other threads:[~2010-08-06 23:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-05 21:33 Greg KH
2010-08-06 18:27 ` Linus Torvalds
2010-08-06 18:41 ` Greg KH
2010-08-06 23:05 ` Stefan Richter [this message]
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=4C5C952C.6070408@s5r6.in-berlin.de \
--to=stefanr@s5r6.in-berlin.de \
--cc=akpm@linux-foundation.org \
--cc=devel@driverdev.osuosl.org \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.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
all inboxes | Powered by JetHome®