Jakub Narebski [off-list ref] writes:
picca [off-list ref] writes:
quoted
Junio C Hamano [off-list ref] wrote:
[...]
quoted
quoted
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
$
-- Sergei.