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

Re: Apply commits from one branch to another branch (tree structure is different)

From
Andrew Wong <andrew.kw.w@gmail.com>
Date
Mar 14, 2014, 19:18 UTC
Message-ID
<CADeaMWpw4gx00QpUJ7u49sQvu7KbhvhH14TMdHXBRXq4wCNDZA@mail.gmail.com>
In-Reply-To
<CAD6G_RTZaaYBP0MrmRYhce2v+A+WwvY=97Do3LoWW-SYzkHM2g@mail.gmail.com>
On Fri, Mar 14, 2014 at 1:39 PM, Jagan Teki <jagannadh.teki@gmail.com> wrote:
> Suppose developer send 10 patches on branch1 where are changes in terms
> of <dir>_<version>/ then I need to apply on my local repo branch1, till now
> is fine then I need to apply same 10 patches on to my branch2 where source
> tree <dir> which is quite question here how can I do.

You might be able to use the subtree option in recursive merge. Try something like:

    git cherry-pick -X subtree=foo <commit>

This tells git to apply the changes to the "foo" directory in your current branch (branch2).

Previous: Brandon McCaigNext: Jagan Teki
Message 4 of 9 in “Apply commits from one branch to another branch (tree structure is different)”
  1. Jagan TekiMar 14, 2014
  2. Jagan TekiMar 14, 2014
  3. Brandon McCaigMar 18, 2014
  4. Andrew WongMar 14, 2014
  5. Jagan TekiMar 14, 2014
  6. Andrew WongMar 14, 2014
  7. Jagan TekiMar 14, 2014
  8. Andrew WongMar 14, 2014
  9. Brandon McCaigMar 18, 2014

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.