git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: cherry picking several patches at once

From
FBFelipe Balbi <me@felipebalbi.com>
Date
Jan 24, 2010, 10:52 UTC
Message-ID
<1264330354.14140.1.camel@gandalf>
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
Previous: Sverre RabbelierNext: Felipe Contreras
Message 5 of 7 in “cherry picking several patches at once”
  1. Felipe BalbiJan 21, 2010
  2. Felipe ContrerasJan 22, 2010
  3. Marc WeberJan 23, 2010
  4. Sverre RabbelierJan 23, 2010
  5. Felipe BalbiJan 24, 2010
  6. Felipe ContrerasJan 24, 2010
  7. Marc WeberJan 24, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.