Merge one git repository into another repository as a sub-directory

merge_git_repo_as_subdir

# based on the following:
# http://saintgimp.org/2013/01/22/merging-two-git-repositories-into-one-repository-without-losing-file-history/
# http://blog.caplin.com/2013/09/18/merging-two-git-repositories/

git clone Task    (保证在master）
git clone DopNluServer    （保证在master）
cd Task

git remote add DopNluServer ../DopNluServer
git fetch DopNluServer

git checkout -b DopNluServer DopNluServer/master
mkdir DopNluServer

# '*' will cause git mv to fail because it cannot move DopNluServer into itself
git mv <list all files> DopNluServer
git commit -m "Moves all DopNluServer files into a single directory for merging back into Task"

git checkout master
git merge DopNluServer

# commit and push, and you're finished