merging two disjoint git repositories

I have this persistent desire to play Pathfinder with some friends. A while back I set up a separate ikiwiki repository for it, but decided today that I wanted to handle it as just a section of this main wiki.

I considered just copying what little content I already had from one wiki to the other; but a little reflection led me to try to just merge the two repositories.

First, I just moved everything in the RPG wiki to the /rpg directory in that repository. Then I added the rpg repository as a remote for the primary repository. git fetch rpg && git merge rpg/master. Done.

Git is awesome.