Add shortcuts for fugitive plugin commands

[smckown/dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 68d687ef6d73e46999cac6e705f640799e3e4b52..ad8cca5ee73771a0a9a22e51eb81bbf5eed42874 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -90,9 +90,7 @@ endif
 " Setup swap/backup/undo
 " Note that as of vim 7.4, backupdir // will not expand backup files to a full
 " path as is the case with directory and undodir.
-let s:dir = expand(has('win32') ? '~/Application Data/Vim' : has('mac') ?
-  \ '~/Library/Vim' : '~/.local/share/vim')
-execute 'set directory^=' . s:dir . '/swap//'
+let s:dir = expand(has('win32') ? '$HOME/vimfiles' : '$HOME/.vim')
 if !isdirectory(s:dir . '/')
   call mkdir(s:dir)
 endif
@@ -105,6 +103,7 @@ endif
 if !isdirectory(s:dir . '/undo/')
   call mkdir(s:dir . '/undo')
 endif
+execute 'set directory^=' . s:dir . '/swap//'
 if isdirectory(s:dir . '/backup/')
   execute 'set backupdir=' . s:dir . '/backup//'
   set backup
@@ -211,6 +210,18 @@ if has("autocmd")
     \ endif
 endif
 
+" Fugitive shortcuts
+nnoremap <silent> <leader>gs :Gstatus<CR>
+nnoremap <silent> <leader>gd :Gdiff<CR>
+nnoremap <silent> <leader>gc :Gcommit<CR>
+nnoremap <silent> <leader>gb :Gblame<CR>
+nnoremap <silent> <leader>gl :Glog<CR>
+nnoremap <silent> <leader>gp :Git push<CR>
+nnoremap <silent> <leader>gr :Gread<CR>
+nnoremap <silent> <leader>gw :Gwrite<CR>
+"nnoremap <silent> <leader>ge :Gedit<CR>
+nnoremap <silent> <leader>gi :Git add -p %<CR>
+
 " EasyGrep
 " To ignore tags file, use system grep.
 let g:EasyGrepCommand=1