linux-kernel - Re: [GIT PATCH] STAGING merge for .36

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <4C5C952C.6070408@s5r6.in-berlin.de>
Date:	Sat, 07 Aug 2010 01:05:16 +0200
From:	Stefan Richter <stefanr@...6.in-berlin.de>
To:	Greg KH <greg@...ah.com>
CC:	Linus Torvalds <torvalds@...ux-foundation.org>,
	Andrew Morton <akpm@...ux-foundation.org>,
	linux-kernel@...r.kernel.org, devel@...verdev.osuosl.org
Subject: Re: [GIT PATCH] STAGING merge for .36

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/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/