[likeliv]

There is another tool called git-subtree that should solve these problems, I think. But I've never seen it in use

[Skunkleton]

git subtree is just a wrapper around subtree merges, I don't think they solve the same problem as submodules.