merge shortcut

12 years ago · 8f561deea6
parent 43bf241097
commit 8f561deea6
3 changed files with 3 additions and 2 deletions
--- a/1
+++ b/1
@ -32,6 +32,7 @@
  br = branch
  ps = push
  pl = pull
+  mg = merge
  hub = push origin master
  subup = submodule foreach git pull
  rs = reset master --hard
--- a/vim/bundle/ctrlp
+++ b/vim/bundle/ctrlp
@ -1 +1 @@
-Subproject commit b1035a2c6d29a80ea7fd44077814d0bbfc9cdba7
+Subproject commit 96bd4b37f4459f30cc6963142aff6697e42bf69e
--- a/vim/bundle/supertab
+++ b/vim/bundle/supertab
@ -1 +1 @@
-Subproject commit 8302775fc2dee4935c35f3436e59486940dba3b8
+Subproject commit 69306133a3652e1890ef719ef58eb7e9e5efab18