Subject: Re: how to use git merge -s subtree?

From: David Soria Parra <[email-masked]>
Date: Sun, 06 Jan 2008 02:22:47 +0100

> 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