How can I sync files in two different git repositories (not clones) and maintain history?

Question

I maintain two different git repos that need to share some files, and I\'d like the commits in one repo to show up in the other. What\'s a good way to do that for ongoing ma

Answer 1

The subtree merge strategy, combined with the script git subtree, might help here.
It would work for push and pull.
It has still some issue with merges, although Git1.7.0 will fix that with a '-Xsubtree' option, but it still worth looking into.

Answer 2

I'm assuming you want perlfaq history in perl repo. I'd do this (in a perl repo)

git remote add perlfaq git://perlfaq... # real uri
git checkout perlfaq/master -b perlfaq
git checkout master # or whatever
git merge perlfaq

contrary to popular belief git does not have to have a common history to perform merge. I know I was merging 3+ repo's this way in regen2. This may be painful the first time. But after that it shouldn't be too painful. Unfortunately you can only merge 1-way but you can probably cherry-pick patches from the perl repo into perlfaq if you want.