X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/02812cc93759fbd129126b5419eaa933d0851083..f46f2a13fa401bb7421432da225fb6fea5ff4c7b:/vim/vimrc diff --git a/vim/vimrc b/vim/vimrc index 91f0a69..b25648e 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -604,8 +604,11 @@ nnoremap gcc :tab G commit -v nnoremap gca :tab G commit -v --amend nnoremap gcf :tab G commit -v --fixup= nnoremap gp :echohl WarningMsg \| echo "use \gpp instead" \| echohl None -nnoremap gpp :G push -nnoremap gpf :G push --force-with-lease +nnoremap gpp :Git push \| copen +nnoremap gpf :Git push --force-with-lease \| copen +nnoremap gll :Git pull +nnoremap gru :Git rebase --interactive @{upstream} +nnoremap grp :Git rebase --interactive @{push} nnoremap ga :Gwrite nnoremap gb :G blame @@ -616,6 +619,7 @@ augroup end " Gundo {{{2 nnoremap :GundoToggle +let g:gundo_prefer_python3 = 1 " indent-guides {{{2 let g:indent_guides_default_mapping = 0