Let\'s say I\'ve got a setup that look something like
phd/code/ phd/figures/ phd/thesis/
For historical reasons, these all have their own g
You could try the subtree merge strategy. It will let you merge repo B into repo A. The advantage over git-filter-branch is it doesn't require you to rewrite your history of repo A (breaking SHA1 sums).
git-filter-branch