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

Re: Merging only a subdirectory from one branch to the other

From
Taylor Hedberg <tmhedberg@gmail.com>
Date
Feb 7, 2012, 15:24 UTC
Message-ID
<20120207152457.GB2662@foodlogiq3-xp-d620>
In-Reply-To
<CAHVO_90MQamw7oB8ry5YBEWSnRnxDZvQ4ApVuuv4AYR6VRuXSw@mail.gmail.com>
Howard Miller, Tue 2012-02-07 @ 09:38:22+0000:
Show 7 quoted lines
> I have a branch with a particular subdirectory tree. The tree has a
> lot of history. However, all the history for that subdirectory is
> exclusive to it (no commits changed anything outside it). I now need
> to merge that subdirectory into a completely different branch without
> loosing any history. I think git-read-tree might have something to do
> with it but I don't understand the help file at all. Any help
> appreciated.

You might find git-subtree [1] useful for this. The `git subtree split` sub-command in particular enables you to factor out the history of a particular subdirectory in your repo into a separate branch, which you could then merge into some other branch as desired.

[1] https://github.com/apenwarr/git-subtree
Previous: Howard MillerNext: Neal Kreitzinger
Message 2 of 3 in “Merging only a subdirectory from one branch to the other”
  1. Howard MillerFeb 7, 2012
  2. Taylor HedbergFeb 7, 2012
  3. Neal KreitzingerFeb 10, 2012

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.