http://stackoverflow.com/questions/1683531/how-to-import-existing-git-repository-into-another
I have a (Windows) GIT repository in a folder called XXX, and I have second GIT repository called YYY.
I want to import the XXX repository into the YYY repository, add all XXX's change history to YYY, and renameXXX to ZZZ.
Folder structure before:
XXX
|- .git
|- ZZZ
Folder structure after:
YYY
|- .git <-- This now contains the change history from XXX
|- ZZZ <-- This was originally XXX
|- (other folders)
Probably the simplest way would be to pull the XXX stuff into a branch in YYY and the merge it into master:
In YYY:
git remote add other /path/to/XXX
git fetch other
git checkout -b ZZZ other/master
mkdir ZZZ
git mv stuff ZZZ/stuff # as necessary
git checkout master # should add ZZZ to master
git commit
git remote rm other
git push # if you have a remote, that is
I actually just tried this with a couple of my repos and it works. Unlike Jörg's answer it won't let you continue to use the other repo, but I don't think you specified that anyway.