Comment by wheybags

I've found that git subtrees are a much better option. Good intro here:https://www.atlassian.com/git/tutorials/git-subtree

They're like submodules, but you can edit them and they're embedded in your history, not just a reference.