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
NKNeal Kreitzinger <nkreitzinger@gmail.com>
Date
Feb 10, 2012, 00:51 UTC
Message-ID
<4F346A21.2080008@gmail.com>
In-Reply-To
<CAHVO_90MQamw7oB8ry5YBEWSnRnxDZvQ4ApVuuv4AYR6VRuXSw@mail.gmail.com>
On 2/7/2012 3:38 AM, Howard Miller wrote:
Show 8 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.
>

Does the 'subtree merge' described in this link do what you want: http://progit.org/book/ch6-7.html (I can't say I've actually tried it myself, yet.)

v/r, neal

Previous: Taylor Hedberg
Message 3 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.