Permalink
Browse files

update sm

  • Loading branch information...
1 parent 46271c9 commit f916d7244d2601d19ad389c377d56cc40e4c4e86 @jalberto committed Oct 10, 2012
View
3 .gitmodules
@@ -70,3 +70,6 @@
[submodule "bundle/vim-coffee-script"]
path = bundle/vim-coffee-script
url = git://github.com/kchmck/vim-coffee-script.git
+[submodule "bundle/vim-fugitive"]
+ path = bundle/vim-fugitive
+ url = git://github.com/tpope/vim-fugitive.git
2 bundle/neocomplcache
@@ -1 +1 @@
-Subproject commit 569e474e561abe762b5af1566b3783d7a1845862
+Subproject commit 8fd9d9697c98e680be05ee33c512d3b69ec007c7
2 bundle/neocomplcache-snippets-complete
@@ -1 +1 @@
-Subproject commit d2f088dee53599520aa43b6d3dbd9caac5e806a4
+Subproject commit 04dd784a5b0d3885c8fbdcfd734d15003c12c451
2 bundle/nerdcommenter
@@ -1 +1 @@
-Subproject commit baa453aad84bbdb999c9d75915886244b98c39f3
+Subproject commit 17168b0d613ae317a7daa021aadb03fe6e92cc76
2 bundle/nerdtree
@@ -1 +1 @@
-Subproject commit a1433c485eb254838c1db52e087d5ec4d1e77cfd
+Subproject commit bf79e223aefe0665bcc62b5dcc4c2c23c6f23fc5
2 bundle/supertab
@@ -1 +1 @@
-Subproject commit 12f3dc40fdfa3572a5b923e7a174516d46f2f78c
+Subproject commit 7152e361e78d08857c577b1161fe6f6235b8a9aa
2 bundle/vim-autoclose
@@ -1 +1 @@
-Subproject commit a435a9aed0abbcf2821f812d2f7dd8dd3b97e360
+Subproject commit a9a3b7384657bc1f60a963fd6c08c63fc48d61c3
2 bundle/vim-coffee-script
@@ -1 +1 @@
-Subproject commit d6dcb9b0fb5beac9e84cfb84c1917b7e0df5850f
+Subproject commit 089506ed89da1849485fdfcca002a42111759fab
2 bundle/vim-endwise
@@ -1 +1 @@
-Subproject commit 74306aa18c03ee2fdb044609e6f0bc866872711d
+Subproject commit 33f9ee05b7e62ba85a20ea38095820cf091b35e3
1 bundle/vim-fugitive
@@ -0,0 +1 @@
+Subproject commit f43393dd9a3bfe01c19af4d3c67e4c4782f09f34
2 bundle/vim-rails
@@ -1 +1 @@
-Subproject commit 9fb06f5af5c02495ebd2826049a42526f4d9a788
+Subproject commit 7d79b45e55d5e0c3f856269362e664258528e4cb
2 bundle/vim-unimpaired
@@ -1 +1 @@
-Subproject commit e8013727a008a68664a789fe0d2b5c2ab2ecf657
+Subproject commit 9507b80198acd1dd5da10fb01f69fa735c163800
2 snippets
@@ -1 +1 @@
-Subproject commit e80158c9985b2d1fe66669529a4bc65ad6057ad4
+Subproject commit b1c30e017ef5c703e36ca7a79e102507a042b5a5
View
10 tips.md
@@ -57,4 +57,14 @@
* ysiw<b> -> <b>h</b>
* M-v S<p class=x>
+# Fugitive
+
+* :Gdiff
+** | 2 | 1 | 3 |
+*** head, result, merge
+** diffget //[2/3]
+** diffput //1
+* :Gwrite
+** mantains the actual buffer as result
+
/* vim: set ts=4 sw=4 tw=0 fdm=manual tw=40: */

0 comments on commit f916d72

Please sign in to comment.