An excellent tool I have used for similar purposes in the past (although it can do other things as well) is git-subtree. I recommend checking it out: https://github.com/apenwarr/git-subtree

Edit a more useful page: https://github.com/apenwarr/git-subtree/blob/master/git-subt...