Thread (7 messages) flat view 7 messages, 4 authors, 2016-06-15

Re: cherry picking several patches at once

From: Felipe Contreras <hidden>
Date: 2016-06-15 22:48:05

Heippa,

On Thu, Jan 21, 2010 at 6:11 PM, Felipe Balbi [off-list ref] 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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help