From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Fri, 22 Jan 2010 23:57:40 GMT
Subject: Re: cherry picking several patches at once
Message-ID: <94a0d4531001221557n7a892f03u5e5d1c5e5ba5fea0@mail.gmail.com>
In-Reply-To: <20100121161157.GA3628@gandalf>

Heippa,

On Thu, Jan 21, 2010 at 6:11 PM, Felipe Balbi <me@felipebalbi.com> wrote:
> I wonder if it's possible to cherry several patches at once ?
> Can't find anything on any docs, but something like:
>
> $ git cherry-pick <commit_id_start>..<commit_id_end> -- \
>        /path/to/directory
>
> I want to do that because I keep patches to the musb driver (on linux
> kernel) based on top of linus' mainline tree and on top of internal
> tree.
>
> The internal tree is outdated (not following mainline), but the musb
> driver is basically in sync, so cherry picking works, but it's a bit
> painful when I have to pick patches from community and manually
> cherry-pick to the other branch based on my internal tree.
>
> If there's a way (besides git rebase --onto) to do that I would very
> much like to know.

Have you tried something like:
git format-patch old-base --full-diff -- /path
git am -3 *.patch

> Another thing that would be nice to have, is to pass the HEAD to which
> we want to cherry-pick, so we can cherry-pick to not-checked-out
> branches.

I think that would not be possible because of the challenges when
dealing with conflicts.

Cheers.

-- 
Felipe Contreras