gistfile1.txt

tekkub@fe1:~/tmp$ git clone git@github.com:jovo/meta-oopsi.git
Initialized empty Git repository in /home/tekkub/tmp/meta-oopsi/.git/
remote: Counting objects: 2658, done.
remote: Compressing objects: 100% (1938/1938), done.
remote: Total 2658 (delta 714), reused 2616 (delta 701)
Receiving objects: 100% (2658/2658), 583.86 MiB | 22200 KiB/s, done.
Resolving deltas: 100% (714/714), done.
Checking out files: 100% (2347/2347), done.

tekkub@fe1:~/tmp$ cd meta-oopsi/

tekkub@fe1:~/tmp/meta-oopsi$ git remote add thesis git://github.com/jovo/thesis-oopsi.git

tekkub@fe1:~/tmp/meta-oopsi$ git fetch thesis
remote: Counting objects: 62, done.
remote: Compressing objects: 100% (44/44), done.
remote: Total 44 (delta 33), reused 0 (delta 0)
Unpacking objects: 100% (44/44), done.
From git://github.com/jovo/thesis-oopsi
 * [new branch]      master     -> thesis/master

tekkub@fe1:~/tmp/meta-oopsi$ rm -rf thesis/

tekkub@fe1:~/tmp/meta-oopsi$ git commit -a -m "Remove bad submodule"
[master 64bb5eb] Remove bad submodule
 1 files changed, 0 insertions(+), 1 deletions(-)
 delete mode 160000 thesis

tekkub@fe1:~/tmp/meta-oopsi$ git merge -s ours --no-commit thesis/master
Automatic merge went well; stopped before committing as requested

tekkub@fe1:~/tmp/meta-oopsi$ git read-tree --prefix=thesis/ -u thesis/master

tekkub@fe1:~/tmp/meta-oopsi$ git commit -m "Subtree merging thesis"
[master a82037b] Subtree merging thesis

tekkub@fe1:~/tmp/meta-oopsi$ git remote add tek git@github.com:tekkub/meta-oopsi.git

tekkub@fe1:~/tmp/meta-oopsi$ git push tek master
Counting objects: 51, done.
Compressing objects: 100% (48/48), done.
Writing objects: 100% (48/48), 258.93 MiB | 32604 KiB/s, done.
Total 48 (delta 19), reused 0 (delta 0)
To git@github.com:tekkub/meta-oopsi.git
   69743c0..a82037b  master -> master