From: Taylor Hedberg <tmhedberg@gmail.com>
Date: Tue, 07 Feb 2012 15:24:57 GMT
Subject: Re: Merging only a subdirectory from one branch to the other
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:
> 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