diff --git a/nvim/.config/nvim/after/plugin/fugitive.vim b/nvim/.config/nvim/after/plugin/fugitive.vim index 62b1c0e..5bef9eb 100644 --- a/nvim/.config/nvim/after/plugin/fugitive.vim +++ b/nvim/.config/nvim/after/plugin/fugitive.vim @@ -1,25 +1,25 @@ nnoremap ga :Git fetch --all xnoremap gb :Git blame -nnoremap gb :Git branch -nnoremap gB :Git checkout -b +nnoremap gb :Git branch -a +nnoremap gB :Git branch +nnoremap gc :Git checkout -b +nnoremap gC :Git checkout nnoremap gd :Ghdiffsplit! nnoremap gD :Gvdiffsplit! -nnoremap gs :Git -nnoremap gS :Git -nnoremap gc :Git commit -v -q -nnoremap gC :Git commit -v -q %:p -nnoremap gp :Git push -nnoremap gP :Git push -u -nnoremap g- :Git stash:e -nnoremap g+ :Git stash pop:e -nnoremap gw :Gwrite -nnoremap gM :0,3Git blame -nnoremap gr :Git rebase origin/master -nnoremap gR :Git rebase upstream/master nnoremap gl :Git log % nnoremap gL :Git log -n 100 xnoremap gl :call git_log_range() xnoremap gL :call git_log_named_block() +nnoremap gM :Git merge origin/ +nnoremap gp :Git push +nnoremap gP :Git push -u +nnoremap gr :Git rebase origin/master +nnoremap gR :Git rebase origin/main +nnoremap g- :Git stash:e +nnoremap g+ :Git stash pop:e +nnoremap gs :Git +nnoremap gS :Git +nnoremap gw :Gwrite " For 3 way merge nnoremap dl :diffget //2