Git: Submodule地獄からの脱出 ref: http://qiita.com/kohashi/items/f4a50c5436b326e9475b

file0.txt

git rm --cached testSubModule

file1.txt

git rm .gitmodules 

file10.txt

git checkout -b __work_for_import__

file11.txt

cd ..
git remote add importSubmodule testSubModule/

file12.txt

git pull importSubmodule __work_for_import__

file13.txt

git filter-branch --subdirectory-filter testSubModule/ HEAD

file14.txt

git push importSubmodule __work_for_import__

file15.txt

git reset --hard HEAD^

file2.txt

rm -rf testSubModule/.git 

file3.txt

git add testSubModule

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is up-to-date with 'origin/master'.
#
# Changes to be committed:
#       deleted:    .gitmodules
#       deleted:    testSubModule
#       new file:   testSubModule/README.md
#       new file:   testSubModule/...submoduleのファイルがたくさん...
#       new file:   testSubModule/...
#       new file:   testSubModule/...
#       new file:   testSubModule/...

file4.txt

git rm -r --cached testSubModule

file5.txt

cd testSubModule
git init
git add .
git commit -m "change to submodule"

file6.txt

git remote add origin リモートリポジトリのパス(git@github.com:Xxx/testSubModule.git等)

file7.txt

git pull origin master
git checkout --ours .
git commit -a

file8.txt

git push origin master

file9.txt

git filter-branch --index-filter \
  'git ls-files -s | sed "s@[[:cntrl:]]\"*@&testSubModule/@" |
      GIT_INDEX_FILE=$GIT_INDEX_FILE.new \
        git update-index --index-info &&
  mv $GIT_INDEX_FILE.new $GIT_INDEX_FILE || true' HEAD