The mainstream version of this post is called subtree-merge and supported by recent Git versions ootb