Merge branch 'master' of git://github.com/vgod/vimrc

vgod · Mar 8, 2013 · a598dcb · a598dcb
2 parents ad36364 + 55f3aee
commit a598dcb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -91,3 +91,6 @@
 [submodule "bundle/vim-coffee-script"]
 	path = bundle/vim-coffee-script
 	url = git://github.com/kchmck/vim-coffee-script.git
+[submodule "bundle/vim-gitgutter"]
+	path = bundle/vim-gitgutter
+	url = git://github.com/airblade/vim-gitgutter.git
diff --git a/README.md b/README.md
@@ -140,6 +140,8 @@ PLUGINS
 
   `:Ack [options] {pattern} [{directory}]`
 
+* [Git Gutter](https://github.com/airblade/vim-gitgutter): shows a git diff in the 'gutter' (sign column). It shows whether each line has been added, modified, and where lines have been removed.
+
 Language specific supports
 --------------------------
 

diff --git a/bundle/vim-gitgutter b/bundle/vim-gitgutter
diff --git a/vimrc b/vimrc
@@ -333,3 +333,6 @@ let g:snipMateAllowMatchingDot = 0
 
 " --- coffee-script
 au BufWritePost *.coffee silent CoffeeMake! -b | cwindow | redraw! " recompile coffee scripts on write
+
+" --- vim-gitgutter
+let g:gitgutter_enabled = 1