From: Alydis <alydis@august8.net>
To: Jeff King <peff@peff.net>
Cc: git <git@vger.kernel.org>
Subject: Re: Generating patches/Cherry Picking for a large number of commits
Date: Fri, 28 Aug 2009 14:50:53 -0500 [thread overview]
Message-ID: <ae09c2a40908281250r42275a3o96825b89e725bace@mail.gmail.com> (raw)
In-Reply-To: <20090828194556.GA13302@coredump.intra.peff.net>
Ack! Embarrassing RTFM.
While I have your attention, however, I noticed that git am <path>
will apply the list patches generated by format-patch. The
documentation said something about mbox/maildir directories, which I
actually am not that familiar with. Is it safe to say that git am
<path> will read the path and apply patches in numerical order? Does
it allow skipping?
Thanks again,
Tommy Wang
On Fri, Aug 28, 2009 at 2:45 PM, Jeff King<peff@peff.net> wrote:
> On Fri, Aug 28, 2009 at 02:26:43PM -0500, Alydis wrote:
>
>> I've tried something along these lines:
>>
>> git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
>> cd linux-2.6
>> git checkout -b mybranch v2.6.21
>> git format-patch -o patches v2.6.21..v2.6.30 arch/powerpc/boot
>> git am -3 patches/*
>>
>> But, to my dismay, format-patch here tears apart the commits and
>> applies ONLY the hunks that apply to the arch/powerpc/boot directory.
>> What I'd much rather do is obtain a list of commits that apply to
>> arch/powerpc/boot; but, then apply the entire patch.
>
> By default, format-patch (and log, gitk, etc) when given a path limiter
> will also limit the diff shown. You can override it with --full-diff.
>
> -Peff
>
next prev parent reply other threads:[~2009-08-28 19:51 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-28 19:26 Generating patches/Cherry Picking for a large number of commits Alydis
2009-08-28 19:45 ` Jeff King
2009-08-28 19:50 ` Alydis [this message]
2009-08-28 20:34 ` Jakub Narebski
2009-08-28 22:35 ` Junio C Hamano
2009-08-28 21:54 ` Jeff King
2009-08-28 22:31 ` 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=ae09c2a40908281250r42275a3o96825b89e725bace@mail.gmail.com \
--to=alydis@august8.net \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).