From: Neal Kreitzinger <nkreitzinger@gmail.com>
Date: Fri, 10 Feb 2012 00:51:45 GMT
Subject: Re: Merging only a subdirectory from one branch to the other
Message-ID: <4F346A21.2080008@gmail.com>
In-Reply-To: <CAHVO_90MQamw7oB8ry5YBEWSnRnxDZvQ4ApVuuv4AYR6VRuXSw@mail.gmail.com>

On 2/7/2012 3:38 AM, Howard Miller wrote:

> 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