Skip to content

Instantly share code, notes, and snippets.

@aroemen
Last active August 29, 2015 14:26
Show Gist options
  • Save aroemen/fb83c37bedb67e1ff5d6 to your computer and use it in GitHub Desktop.
Save aroemen/fb83c37bedb67e1ff5d6 to your computer and use it in GitHub Desktop.
git remote add -f Bproject /path/to/B
git merge -s ours --no-commit Bproject/master
git read-tree --prefix=dir-B/ -u Bproject/master
git commit -m "Merge B project as our subdirectory"
git pull -s subtree Bproject master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment