Use git subtree to merge repositories with history

Use git subtree to merge repositories with history. For example, the following command merges the master branch of repository foo into the directory foo on the current repository.

git subtree add -P foo /path/to/foo master

See https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt for more details.

Tweet