gnychis@ubuntu:~/Documents/android-wireless-monitor$ git config --global diff.renamelimit 0
gnychis@ubuntu:~/Documents/android-wireless-monitor$ vim /home/gnychis/.gitconfig
gnychis@ubuntu:~/Documents/android-wireless-monitor$ git fetch RepoA
gnychis@ubuntu:~/Documents/android-wireless-monitor$ ls -l
total 24
drwxrwxr-x  9 gnychis gnychis  4096 2012-03-09 08:33 android-ndk-r6b
drwxrwxr-x 28 gnychis gnychis 12288 2012-03-09 08:33 android-wireshark
drwxrwxr-x  4 gnychis gnychis  4096 2012-03-09 08:33 os
drwxrwxr-x  3 gnychis gnychis  4096 2012-03-09 08:33 ported-deps
-rw-rw-r--  1 gnychis gnychis     0 2012-03-09 08:33 README
gnychis@ubuntu:~/Documents/android-wireless-monitor$ git merge --no-commit RepoA/master
Automatic merge went well; stopped before committing as requested
gnychis@ubuntu:~/Documents/android-wireless-monitor$ ls -ltrh
total 68K
-rw-rw-r--  1 gnychis gnychis    0 2012-03-09 08:33 README
drwxrwxr-x  9 gnychis gnychis 4.0K 2012-03-09 08:33 android-ndk-r6b
drwxrwxr-x 28 gnychis gnychis  12K 2012-03-09 08:33 android-wireshark
drwxrwxr-x  3 gnychis gnychis 4.0K 2012-03-09 08:33 ported-deps
drwxrwxr-x  4 gnychis gnychis 4.0K 2012-03-09 08:33 os
-rw-rw-r--  1 gnychis gnychis   45 2012-03-09 09:31 Makefile
drwxrwxr-x  3 gnychis gnychis 4.0K 2012-03-09 09:31 gen
-rw-rw-r--  1 gnychis gnychis  362 2012-03-09 09:31 default.properties
-rwxrwxr-x  1 gnychis gnychis  116 2012-03-09 09:31 build.sh
-rw-rw-r--  1 gnychis gnychis 1.6K 2012-03-09 09:31 AndroidManifest.xml
drwxrwxr-x 18 gnychis gnychis 4.0K 2012-03-09 09:31 jni
drwxrwxr-x  3 gnychis gnychis 4.0K 2012-03-09 09:31 obj
drwxrwxr-x  3 gnychis gnychis 4.0K 2012-03-09 09:31 libs
-rw-rw-r--  1 gnychis gnychis 1.2K 2012-03-09 09:31 proguard.cfg
drwxrwxr-x  3 gnychis gnychis 4.0K 2012-03-09 09:31 src
drwxrwxr-x  8 gnychis gnychis 4.0K 2012-03-09 09:31 res
gnychis@ubuntu:~/Documents/android-wireless-monitor$ mkdir application
gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv gen/^C
gnychis@ubuntu:~/Documents/android-wireless-monitor$ ls -ltrh
total 72K
-rw-rw-r--  1 gnychis gnychis    0 2012-03-09 08:33 README
drwxrwxr-x  9 gnychis gnychis 4.0K 2012-03-09 08:33 android-ndk-r6b
drwxrwxr-x 28 gnychis gnychis  12K 2012-03-09 08:33 android-wireshark
drwxrwxr-x  3 gnychis gnychis 4.0K 2012-03-09 08:33 ported-deps
drwxrwxr-x  4 gnychis gnychis 4.0K 2012-03-09 08:33 os
-rw-rw-r--  1 gnychis gnychis   45 2012-03-09 09:31 Makefile
drwxrwxr-x  3 gnychis gnychis 4.0K 2012-03-09 09:31 gen
-rw-rw-r--  1 gnychis gnychis  362 2012-03-09 09:31 default.properties
-rwxrwxr-x  1 gnychis gnychis  116 2012-03-09 09:31 build.sh
-rw-rw-r--  1 gnychis gnychis 1.6K 2012-03-09 09:31 AndroidManifest.xml
drwxrwxr-x 18 gnychis gnychis 4.0K 2012-03-09 09:31 jni
drwxrwxr-x  3 gnychis gnychis 4.0K 2012-03-09 09:31 obj
drwxrwxr-x  3 gnychis gnychis 4.0K 2012-03-09 09:31 libs
-rw-rw-r--  1 gnychis gnychis 1.2K 2012-03-09 09:31 proguard.cfg
drwxrwxr-x  3 gnychis gnychis 4.0K 2012-03-09 09:31 src
drwxrwxr-x  8 gnychis gnychis 4.0K 2012-03-09 09:31 res
drwxrwxr-x  2 gnychis gnychis 4.0K 2012-03-09 09:32 application
gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv Makefile application/
gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv gen application/
gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv default.properties application/
gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv build.sh application/
gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv AndroidManifest.xml application/
gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv jni application/
gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv obj application/
gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv libs application/
gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv proguard.cfg application/
gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv src application/
gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv res application/
gnychis@ubuntu:~/Documents/android-wireless-monitor$ ls -ltrh
total 28K
-rw-rw-r--  1 gnychis gnychis    0 2012-03-09 08:33 README
drwxrwxr-x  9 gnychis gnychis 4.0K 2012-03-09 08:33 android-ndk-r6b
drwxrwxr-x 28 gnychis gnychis  12K 2012-03-09 08:33 android-wireshark
drwxrwxr-x  3 gnychis gnychis 4.0K 2012-03-09 08:33 ported-deps
drwxrwxr-x  4 gnychis gnychis 4.0K 2012-03-09 08:33 os
drwxrwxr-x  8 gnychis gnychis 4.0K 2012-03-09 09:32 application
gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv .
./          ../         .classpath  .git/       .project
gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv .classpath application/
gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv .project application/
gnychis@ubuntu:~/Documents/android-wireless-monitor$ ls -l
total 28
drwxrwxr-x  9 gnychis gnychis  4096 2012-03-09 08:33 android-ndk-r6b
drwxrwxr-x 28 gnychis gnychis 12288 2012-03-09 08:33 android-wireshark
drwxrwxr-x  8 gnychis gnychis  4096 2012-03-09 09:32 application
drwxrwxr-x  4 gnychis gnychis  4096 2012-03-09 08:33 os
drwxrwxr-x  3 gnychis gnychis  4096 2012-03-09 08:33 ported-deps
-rw-rw-r--  1 gnychis gnychis     0 2012-03-09 08:33 README
gnychis@ubuntu:~/Documents/android-wireless-monitor$ git commit -a
[master 07afab7] Merge remote-tracking branch 'RepoA/master' to pull in the Android application to demonstrate the framework
gnychis@ubuntu:~/Documents/android-wireless-monitor$ git push
Enter passphrase for key '/home/gnychis/.ssh/id_rsa':
Counting objects: 6154, done.
Compressing objects: 100% (1599/1599), done.
Writing objects: 100% (6153/6153), 347.88 MiB | 500 KiB/s, done.
Total 6153 (delta 3533), reused 5888 (delta 3532)
To git@github.com:gnychis/android-wireless-monitor.git
   7a288dd..07afab7  master -> master