Updates baby

inlineblock · Jun 16, 2016 · 2b7bde2 · 2b7bde2
1 parent e126adf
commit 2b7bde2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/gitconfig b/gitconfig
@@ -7,6 +7,8 @@
 [merge]
 	tool = opendiff
 [push]
-  default = simple
+  default = current
 [color]
-	ui = auto
+  ui = auto
+[branch]
+	autosetupmerge = always
diff --git a/keybindings.vim b/keybindings.vim
@@ -31,6 +31,4 @@ imap <F1> <Esc>
 
 imap <S-BS> <C-[>diwi
 
-vnoremap / 0<C-V>I// <esc>
-
 command GdiffInTab tabedit %|Gdiff
diff --git a/vundles.vim b/vundles.vim
@@ -29,16 +29,20 @@ Bundle 'tpope/vim-git'
 Bundle 'tpope/vim-haml'
 Bundle 'tpope/vim-markdown'
 Bundle 'tpope/vim-rails'
+Bundle 'tpope/vim-endwise'
 Bundle 'tpope/vim-repeat'
 Bundle 'tpope/vim-surround'
+Bundle 'mgamba/edit-plus'
 Bundle 'tpope/vim-unimpaired'
 Bundle 'vim-scripts/Align'
 Bundle 'wavded/vim-stylus'
 Bundle 'janx/vim-rubytest'
 Bundle 'mtscout6/syntastic-local-eslint.vim'
+Bundle 'scrooloose/nerdcommenter'
 
 "colorschemes
 Bundle 'tomasr/molokai'
+Bundle 'Peeja/insert_mode_background_color'
 
 "Command-T (Ruby for mvim)
 Bundle 'wincent/Command-T'