How to import existing Git repository into another?

by

Probably the simplest way would be to pull the XXX stuff into a branch in YYY and then 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                      # repeat as necessary for each file/dir
git commit -m "Moved stuff to ZZZ"
git checkout master                
git merge ZZZ --allow-unrelated-histories   # should add ZZZ/ to master
git commit
git remote rm other
git branch -d ZZZ                           # to get rid of the extra branch before pushing
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.

Note: Since this was originally written in 2009, git has added the subtree merge mentioned in the answer below. I would probably use that method today, although of course this method does still work.

More Related Contents:

  1. When would you use the different git merge strategies?
  2. What’s the difference between ‘git merge’ and ‘git rebase’?
  3. How can I prevent foxtrot merges in my ‘master’ branch?
  4. Tell git not to merge binary files but to choose
  5. git: merge two branches: what direction?
  6. Git: Merge a Commit into a different Branch
  7. The following untracked working tree files would be overwritten by merge, but I don’t care
  8. Undo a Git merge that hasn’t been pushed yet
  9. How to replace master branch in Git, entirely, from another branch? [duplicate]
  10. Have Git Select Local Version On Merge Conflict on a Specific File?
  11. How can I selectively merge or pick changes from another branch in Git?
  12. Git workflow and rebase vs merge questions
  13. Git merge left HEAD marks in my files
  14. Resolve Git merge conflicts in favor of their changes during a pull
  15. Merging: Hg/Git vs. SVN
  16. What is the precise meaning of “ours” and “theirs” in git?
  17. git cherry-pick says “…38c74d is a merge but no -m option was given”
  18. Git – Ignore files during merge
  19. git remove merge commit from history
  20. Disable Git Rename Detection
  21. tell git to use ours merge strategy on specific files
  22. git merge, keep both
  23. git partial merge, not whole branch
  24. Simple tool to ‘accept theirs’ or ‘accept mine’ on a whole file using git
  25. How can I get the parents of a merge commit in Git?
  26. How can I configure KDiff3 as a merge tool and diff tool for git?
  27. Reverting a git merge while allowing for the same merge later)
  28. Sharing rerere cache
  29. Git merge squash repeatedly
  30. How do you detect an evil merge in git?

Leave a Comment