From: Linus Torvalds <torvalds@osdl.org>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Michal Ludvig <michal@logix.cz>,
linux-crypto@vger.kernel.org, git@vger.kernel.org
Subject: Re: Creating diff from 2.6.16 from cryptodev-2.6 git tree
Date: Thu, 29 Jun 2006 19:44:40 -0700 (PDT) [thread overview]
Message-ID: <Pine.LNX.4.64.0606291943010.12404@g5.osdl.org> (raw)
In-Reply-To: <20060630023228.GA28850@gondor.apana.org.au>
On Fri, 30 Jun 2006, Herbert Xu wrote:
> On Thu, Jun 29, 2006 at 07:25:01PM -0700, Linus Torvalds wrote:
> >
> > The easiest by far is if you only care about a certain sub-directory.
> > Then, assuming the branch "crypto" is the top-most commit of the cryptodev
> > repo, just do
> >
> > git diff v2.6.16..crypto -- crypto/
>
> Yes, you should always do something like this when backporting to make
> sure that you haven't missed patches merged in ways that you didn't
> anticipate.
>
> Although I'm not aware of any such patches in the time frame that Michal
> has in mind.
Note that this is why
git log -p --full-diff v2.6.16.. crypto/
is so great. It will show everything that touched that subdirectory, along
with the incidentals. I think that in this case, that's exactly what
Michal wants.
Linus
next prev parent reply other threads:[~2006-06-30 2:45 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-30 1:18 Creating diff from 2.6.16 from cryptodev-2.6 git tree Michal Ludvig
2006-06-30 1:36 ` Herbert Xu
2006-06-30 2:25 ` Linus Torvalds
2006-06-30 2:32 ` Herbert Xu
2006-06-30 2:44 ` Linus Torvalds [this message]
2006-06-30 3:05 ` Michal Ludvig
2006-06-30 5:45 ` Michal Ludvig
2006-06-30 6:20 ` Linus Torvalds
2006-06-30 6:28 ` 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=Pine.LNX.4.64.0606291943010.12404@g5.osdl.org \
--to=torvalds@osdl.org \
--cc=git@vger.kernel.org \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=michal@logix.cz \
/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;
as well as URLs for NNTP newsgroup(s).