Sergei Organov wrote: > Jakub Narebski <jnareb@xxxxxxxxx> writes: >> picca <picca@xxxxxxxxxxxxxxxxxxxxx> writes: >>> Junio C Hamano <gitster@xxxxxxxxx> wrote: > > [...] > >>>> Or "merge -s subtree". >>> >>> I read the git help merge -s explanation but I do not understand how >>> it can help in my case. >> >> Using subtree merge strategy you can join histories of your project >> and git.git, embedding git.git as a subdirectory like gitk and >> git-gui are now in git.git. It is an alternative to using >> submodules. > > Is subtree merge strategy documented? > > $ grep subtree Documentation/merge-strategies.txt > $ Documentation/howto/using-merge-subtree.txt But I agree that it should be also described, or at least mentioned in Documentation/merge-strategies.txt -- Jakub Narebski Poland - 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
