From: David Soria Parra <sn_@gmx.net>
Date: Sun, 06 Jan 2008 01:22:47 GMT
Subject: Re: how to use git merge -s subtree?
Message-ID: <flpah7$beg$2@ger.gmane.org>
In-Reply-To: <BAYC1-PASMTP12374B54BA370A1E1C6E78AE4E0@CEZ.ICE>


> Hi Miklos,
> 
> Here's another way that is perhaps a little cleaner:
> 
> $ git remote add -f B /path/to/B
> $ git merge -s ours --no-commit B/master
> $ git read-tree --prefix=sub/ -u B/master 
> $ git commit -m "subtree merged B"
> 

hi sean,

that works perfectly but it doesn't preserve the history, does it?

                    dsp