From: Konstantin Khomoutov <flatworm@users.sourceforge.net>
Date: Mon, 07 Nov 2011 15:37:08 GMT
Subject: Re: how to merge sub directory or file?
Message-ID: <20111107193708.6cf2ae81.kostix@domain007.com>
In-Reply-To: <8B3D19E0-2181-4E9C-943F-CA26A399E0D9@gmail.com>

On Mon, 7 Nov 2011 22:54:18 +0800
Emily <lingyan.ren@gmail.com> wrote:

> I have two git projects A and B, content of B is subset of A. For
> example, Project  A and B's tree are as below:
[...]
> When there's new changes in project A, how can I merge them to
> project B without changing B's directory structure?
> 
> Your help will be highly appreciated.
Subtree merging maybe?
See http://progit.org/book/ch6-7.html