X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/cee2c4b32bb163ae3b84242d7aca0092664569c4..ce545a590b536432b8535dc94d8fe0cdc1bc3461:/vim/vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 6b2c8ab..b5d20ad 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -265,6 +265,8 @@ set viewoptions+=folds          " save folds
 set diffopt+=filler         " show filler lines
 set diffopt+=vertical       " always vertical split
 set diffopt+=context:10     " 10 lines context between changes
+set diffopt+=internal
+set diffopt+=algorithm:patience
 
 " reading and writing files {{{2
 set modeline                    " read modelines
@@ -568,6 +570,7 @@ nmap <silent> <leader>qq :echo "hi<" . synIDattr(synID(line("."),col("."),1),"na
 " airline {{{2
 let g:airline#extensions#whitespace#enabled = 1
 let g:airline#extensions#tabline#enabled = 1
+let g:airline#extensions#searchcount#enabled = 0
 let g:airline_powerline_fonts = 1
 
 " checkattach {{{2
@@ -601,8 +604,8 @@ nnoremap <silent> <leader>gcc :tab G commit -v<CR>
 nnoremap <silent> <leader>gca :tab G commit -v --amend<CR>
 nnoremap          <leader>gcf :tab G commit -v --fixup=
 nnoremap <silent> <leader>gp :echohl WarningMsg \| echo "use \<leader>gpp instead" \| echohl None<CR> 
-nnoremap <silent> <leader>gpp :G push<CR>
-nnoremap <silent> <leader>gpf :G push --force-with-lease<CR>
+nnoremap <silent> <leader>gpp :Git push \| copen<CR>
+nnoremap <silent> <leader>gpf :Git push --force-with-lease \| copen<CR>
 nnoremap <silent> <leader>ga :Gwrite<cr>
 nnoremap <silent> <leader>gb :G blame<cr>