> 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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html