Pastebin launched a little side project called VERYVIRAL.com, check it out ;-) Want more features on Pastebin? Sign Up, it's FREE!
Guest

Untitled

By: a guest on Mar 9th, 2012  |  syntax: None  |  size: 5.74 KB  |  views: 18  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. gnychis@ubuntu:~/Documents/android-wireless-monitor$ git config --global diff.renamelimit 0
  2. gnychis@ubuntu:~/Documents/android-wireless-monitor$ vim /home/gnychis/.gitconfig
  3. gnychis@ubuntu:~/Documents/android-wireless-monitor$ git fetch RepoA
  4. gnychis@ubuntu:~/Documents/android-wireless-monitor$ ls -l
  5. total 24
  6. drwxrwxr-x  9 gnychis gnychis  4096 2012-03-09 08:33 android-ndk-r6b
  7. drwxrwxr-x 28 gnychis gnychis 12288 2012-03-09 08:33 android-wireshark
  8. drwxrwxr-x  4 gnychis gnychis  4096 2012-03-09 08:33 os
  9. drwxrwxr-x  3 gnychis gnychis  4096 2012-03-09 08:33 ported-deps
  10. -rw-rw-r--  1 gnychis gnychis     0 2012-03-09 08:33 README
  11. gnychis@ubuntu:~/Documents/android-wireless-monitor$ git merge --no-commit RepoA/master
  12. Automatic merge went well; stopped before committing as requested
  13. gnychis@ubuntu:~/Documents/android-wireless-monitor$ ls -ltrh
  14. total 68K
  15. -rw-rw-r--  1 gnychis gnychis    0 2012-03-09 08:33 README
  16. drwxrwxr-x  9 gnychis gnychis 4.0K 2012-03-09 08:33 android-ndk-r6b
  17. drwxrwxr-x 28 gnychis gnychis  12K 2012-03-09 08:33 android-wireshark
  18. drwxrwxr-x  3 gnychis gnychis 4.0K 2012-03-09 08:33 ported-deps
  19. drwxrwxr-x  4 gnychis gnychis 4.0K 2012-03-09 08:33 os
  20. -rw-rw-r--  1 gnychis gnychis   45 2012-03-09 09:31 Makefile
  21. drwxrwxr-x  3 gnychis gnychis 4.0K 2012-03-09 09:31 gen
  22. -rw-rw-r--  1 gnychis gnychis  362 2012-03-09 09:31 default.properties
  23. -rwxrwxr-x  1 gnychis gnychis  116 2012-03-09 09:31 build.sh
  24. -rw-rw-r--  1 gnychis gnychis 1.6K 2012-03-09 09:31 AndroidManifest.xml
  25. drwxrwxr-x 18 gnychis gnychis 4.0K 2012-03-09 09:31 jni
  26. drwxrwxr-x  3 gnychis gnychis 4.0K 2012-03-09 09:31 obj
  27. drwxrwxr-x  3 gnychis gnychis 4.0K 2012-03-09 09:31 libs
  28. -rw-rw-r--  1 gnychis gnychis 1.2K 2012-03-09 09:31 proguard.cfg
  29. drwxrwxr-x  3 gnychis gnychis 4.0K 2012-03-09 09:31 src
  30. drwxrwxr-x  8 gnychis gnychis 4.0K 2012-03-09 09:31 res
  31. gnychis@ubuntu:~/Documents/android-wireless-monitor$ mkdir application
  32. gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv gen/^C
  33. gnychis@ubuntu:~/Documents/android-wireless-monitor$ ls -ltrh
  34. total 72K
  35. -rw-rw-r--  1 gnychis gnychis    0 2012-03-09 08:33 README
  36. drwxrwxr-x  9 gnychis gnychis 4.0K 2012-03-09 08:33 android-ndk-r6b
  37. drwxrwxr-x 28 gnychis gnychis  12K 2012-03-09 08:33 android-wireshark
  38. drwxrwxr-x  3 gnychis gnychis 4.0K 2012-03-09 08:33 ported-deps
  39. drwxrwxr-x  4 gnychis gnychis 4.0K 2012-03-09 08:33 os
  40. -rw-rw-r--  1 gnychis gnychis   45 2012-03-09 09:31 Makefile
  41. drwxrwxr-x  3 gnychis gnychis 4.0K 2012-03-09 09:31 gen
  42. -rw-rw-r--  1 gnychis gnychis  362 2012-03-09 09:31 default.properties
  43. -rwxrwxr-x  1 gnychis gnychis  116 2012-03-09 09:31 build.sh
  44. -rw-rw-r--  1 gnychis gnychis 1.6K 2012-03-09 09:31 AndroidManifest.xml
  45. drwxrwxr-x 18 gnychis gnychis 4.0K 2012-03-09 09:31 jni
  46. drwxrwxr-x  3 gnychis gnychis 4.0K 2012-03-09 09:31 obj
  47. drwxrwxr-x  3 gnychis gnychis 4.0K 2012-03-09 09:31 libs
  48. -rw-rw-r--  1 gnychis gnychis 1.2K 2012-03-09 09:31 proguard.cfg
  49. drwxrwxr-x  3 gnychis gnychis 4.0K 2012-03-09 09:31 src
  50. drwxrwxr-x  8 gnychis gnychis 4.0K 2012-03-09 09:31 res
  51. drwxrwxr-x  2 gnychis gnychis 4.0K 2012-03-09 09:32 application
  52. gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv Makefile application/
  53. gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv gen application/
  54. gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv default.properties application/
  55. gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv build.sh application/
  56. gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv AndroidManifest.xml application/
  57. gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv jni application/
  58. gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv obj application/
  59. gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv libs application/
  60. gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv proguard.cfg application/
  61. gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv src application/
  62. gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv res application/
  63. gnychis@ubuntu:~/Documents/android-wireless-monitor$ ls -ltrh
  64. total 28K
  65. -rw-rw-r--  1 gnychis gnychis    0 2012-03-09 08:33 README
  66. drwxrwxr-x  9 gnychis gnychis 4.0K 2012-03-09 08:33 android-ndk-r6b
  67. drwxrwxr-x 28 gnychis gnychis  12K 2012-03-09 08:33 android-wireshark
  68. drwxrwxr-x  3 gnychis gnychis 4.0K 2012-03-09 08:33 ported-deps
  69. drwxrwxr-x  4 gnychis gnychis 4.0K 2012-03-09 08:33 os
  70. drwxrwxr-x  8 gnychis gnychis 4.0K 2012-03-09 09:32 application
  71. gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv .
  72. ./          ../         .classpath  .git/       .project    
  73. gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv .classpath application/
  74. gnychis@ubuntu:~/Documents/android-wireless-monitor$ git mv .project application/
  75. gnychis@ubuntu:~/Documents/android-wireless-monitor$ ls -l
  76. total 28
  77. drwxrwxr-x  9 gnychis gnychis  4096 2012-03-09 08:33 android-ndk-r6b
  78. drwxrwxr-x 28 gnychis gnychis 12288 2012-03-09 08:33 android-wireshark
  79. drwxrwxr-x  8 gnychis gnychis  4096 2012-03-09 09:32 application
  80. drwxrwxr-x  4 gnychis gnychis  4096 2012-03-09 08:33 os
  81. drwxrwxr-x  3 gnychis gnychis  4096 2012-03-09 08:33 ported-deps
  82. -rw-rw-r--  1 gnychis gnychis     0 2012-03-09 08:33 README
  83. gnychis@ubuntu:~/Documents/android-wireless-monitor$ git commit -a
  84. [master 07afab7] Merge remote-tracking branch 'RepoA/master' to pull in the Android application to demonstrate the framework
  85. gnychis@ubuntu:~/Documents/android-wireless-monitor$ git push
  86. Enter passphrase for key '/home/gnychis/.ssh/id_rsa':
  87. Counting objects: 6154, done.
  88. Compressing objects: 100% (1599/1599), done.
  89. Writing objects: 100% (6153/6153), 347.88 MiB | 500 KiB/s, done.
  90. Total 6153 (delta 3533), reused 5888 (delta 3532)
  91. To git@github.com:gnychis/android-wireless-monitor.git
  92.    7a288dd..07afab7  master -> master