Re: [GIT PATCH] STAGING merge for .36

From: Stefan Richter
Date: Fri Aug 06 2010 - 19:05:42 EST

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
-=====-==-=- =--- --===
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at