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

diff --git a/vim/vimrc b/vim/vimrc
index b5d20ad..b25648e 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -606,6 +606,9 @@ 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 :Git push \| copen<CR>
 nnoremap <silent> <leader>gpf :Git push --force-with-lease \| copen<CR>
+nnoremap <silent> <leader>gll :Git pull<CR>
+nnoremap <silent> <leader>gru :Git rebase --interactive @{upstream}<CR>
+nnoremap <silent> <leader>grp :Git rebase --interactive @{push}<CR>
 nnoremap <silent> <leader>ga :Gwrite<cr>
 nnoremap <silent> <leader>gb :G blame<cr>
 
@@ -616,6 +619,7 @@ augroup end
 
 " Gundo {{{2
 nnoremap <F7> :GundoToggle<CR>
+let g:gundo_prefer_python3 = 1
 
 " indent-guides {{{2
 let g:indent_guides_default_mapping = 0