linux-kernel - Re: [git pull] Documentation: DocBook/drm, basic copyediting

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <CA+55aFyghT3vx5Y0dPsa4sXpTV_vd0FAtzXurv1oh_26P8G7zQ@mail.gmail.com>
Date:	Sat, 29 Oct 2011 08:03:14 -0700
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Randy Dunlap <rdunlap@...otime.net>
Cc:	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Michael Witten <mfwitten@...il.com>,
	Jesse Barnes <jbarnes@...tuousgeek.org>
Subject: Re: [git pull] Documentation: DocBook/drm, basic copyediting

On Wed, Oct 26, 2011 at 11:54 AM, Randy Dunlap <rdunlap@...otime.net> wrote:
>
> Note:  Please check that I haven't mucked up somewhere, because this:
> $ git diff -M --stat --summary master..HEAD
>
> shows me more than the changes above.

You have indeed messed up  - there are extraneous merges there. But
that's not why your diff fails: your diff probably fails because
"master" is ahead of your base, so when you ask for the diff between
master and HEAD, you get a diff that contains (the reverse of)
everything that I have done that isn't in your tree.

For diffs, you likely want to look at the diff between the "merge
base" and your HEAD. Which is what "..." (triple dot) does, so you can
probably do

   git diff -M --stat --summary master...HEAD

and it should give you the right thing.

However, I really don't see why you have two extra merges on top of
that commit series.

                            Linus
--
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/