Re: how to use git merge -s subtree?

From: Miklos Vajna <vmiklos@frugalware.org>
Date: Jan 6, 2008, 03:45 UTC
Message-ID: <20080106034533.GE29972@genesis.frugalware.org>
In-Reply-To: <BAYC1-PASMTP12374B54BA370A1E1C6E78AE4E0@CEZ.ICE>

On Sat, Jan 05, 2008 at 08:17:40PM -0500, Sean <seanlkml@sympatico.ca> wrote:

Show 10 quoted lines

> 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"
> 
> The first line creates and fetches the remote.  The second line initiates a merge, but
> stops before committing it.  The third line reads B/master into the subdirectory "sub",
> at which point all that remains is committing the completed merge.

great, thanks. that's more simple than mine, and this is necessary for the first commit only. the rest (i hope i'm right) can be done using just by

$ git fetch $ git merge -s subtree B/master

do you mind if i send a patch to add this to Documentation/howto? i don't think it's trivial :)

thanks,
- VMiklos