Sean wrote: > > David, > > Yes, the reason to start with the "--no-commit" merge is so that the history > is properly connected once you do the final commit step. However, I should > have noted in my original message that none of the steps actually use the > subtree merge. Instead they simply prepare a repository such that > future merging can be done with: > > $ git merge -s subtree B/master. > > Cheers, > Sean Well yes the history is preserved, but it's not connected to the subdirectory. So you cannot do git-log B/foo.c as git doesnot know where to search it as it thinks it is in /foo.c not in B/foo.c Cheers - 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