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