From: Felipe Balbi <me@felipebalbi.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: cherry picking several patches at once
Date: Sun, 24 Jan 2010 12:52:34 +0200 [thread overview]
Message-ID: <1264330354.14140.1.camel@gandalf> (raw)
In-Reply-To: <94a0d4531001221557n7a892f03u5e5d1c5e5ba5fea0@mail.gmail.com>
Hi,
On Sat, 2010-01-23 at 01:57 +0200, Felipe Contreras wrote:
> Have you tried something like:
> git format-patch old-base --full-diff -- /path
> git am -3 *.patch
yes, sure that can be done, but the idea is to avoid having
format-patch, switch branches and git am those patches ;-)
> I think that would not be possible because of the challenges when
> dealing with conflicts.
there shouldn't be any. I have the same driver internally and publicly
and would be cherry-picking only the patches for that particular driver.
--
balbi
next prev parent reply other threads:[~2010-01-24 10:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-21 16:11 cherry picking several patches at once Felipe Balbi
2010-01-22 23:57 ` Felipe Contreras
2010-01-23 0:24 ` Marc Weber
2010-01-23 11:17 ` Sverre Rabbelier
2010-01-24 10:52 ` Felipe Balbi [this message]
2010-01-24 13:10 ` Felipe Contreras
2010-01-24 15:31 ` Marc Weber
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=1264330354.14140.1.camel@gandalf \
--to=me@felipebalbi.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
/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).