Import existing Git repository into another

git-import-repository.md

Import existing Git repository into another

Folder structure before (2 separate repositories):

XXX
 |- .git
 |- (project files)
YYY
 |- .git
 |- (project files)

Folder structure after:

YYY
 |- .git  <-- This now contains the change history from XXX
 |-  ZZZ  <-- This was originally XXX
      |- (project files)
 |-  (project files)

In YYY:

git remote add XXX_remote <path-or-url-to-XXX-repo>
git fetch XXX_remote
git merge -s ours --no-commit XXX_remote/master
git read-tree --prefix=ZZZ/ -u XXX_remote/master
git commit -m "Imported XXX as a subtree."
git remote rm XXX_remote
git push

http://stackoverflow.com/a/8396318/135441

May need to add --allow-unrelated-histories in the git merge, if you get "fatal: refusing to merge unrelated histories" and you know that's what you want.

Really useful! Thanks 🎉

Exactly what I needed. Thank you!

Git amazes me daily. Thanks for the notes!

Thanks for the notes. It saved me a lot of browsing

Thank you this was very helpful! @christillman your tip as well!

Very useful. Thanks !

Doesnt keep file histories

Thanks! It's very helpful!

If I delete XXX now, will it cause any effect in YYY ?