|
@@ -11,6 +11,7 @@ Plug 'Shougo/unite.vim'
|
|
|
Plug 'Shougo/vimproc.vim', {'do' : 'make'}
|
|
Plug 'Shougo/vimproc.vim', {'do' : 'make'}
|
|
|
Plug 'EinfachToll/DidYouMean'
|
|
Plug 'EinfachToll/DidYouMean'
|
|
|
Plug 'diepm/vim-rest-console'
|
|
Plug 'diepm/vim-rest-console'
|
|
|
|
|
+Plug 'idanarye/vim-merginal'
|
|
|
|
|
|
|
|
Plug 'vim-scripts/dbext.vim', {'for': 'sql'}
|
|
Plug 'vim-scripts/dbext.vim', {'for': 'sql'}
|
|
|
Plug 'cespare/vim-toml'
|
|
Plug 'cespare/vim-toml'
|
|
@@ -160,7 +161,11 @@ nnoremap <C-T>h :tabprev<cr>
|
|
|
nnoremap <C-T>l :tabnext<cr>
|
|
nnoremap <C-T>l :tabnext<cr>
|
|
|
|
|
|
|
|
" grepper
|
|
" grepper
|
|
|
-nnoremap <Leader>g :Unite grep:.<CR>
|
|
|
|
|
|
|
+nnoremap <Leader>f :Unite grep:.<CR>
|
|
|
|
|
+
|
|
|
|
|
+" git
|
|
|
|
|
+nnoremap <Leader>gs :Gstatus<CR>
|
|
|
|
|
+nnoremap <Leader>gb :Merginal<CR>
|
|
|
|
|
|
|
|
" ------ nvim specific ------
|
|
" ------ nvim specific ------
|
|
|
if has('nvim')
|
|
if has('nvim')
|
