diff --git a/nvim/.config/nvim/after/ftplugin/gitcommit.vim b/nvim/.config/nvim/after/ftplugin/gitcommit.vim index 74e4446..ea70fe8 100644 --- a/nvim/.config/nvim/after/ftplugin/gitcommit.vim +++ b/nvim/.config/nvim/after/ftplugin/gitcommit.vim @@ -3,5 +3,5 @@ setlocal textwidth=72 setlocal iskeyword+=- " Jump to sections of diff -nnoremap [d ?^@@ -nnoremap ]d /^@@ +nnoremap [c ?^@@ +nnoremap ]c /^@@ diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim index 00746cb..56e22db 100644 --- a/nvim/.config/nvim/init.vim +++ b/nvim/.config/nvim/init.vim @@ -17,7 +17,6 @@ Plug 'haorenW1025/completion-nvim' Plug 'tmux-plugins/vim-tmux-focus-events' Plug 'wellle/tmux-complete.vim' " Git support -Plug 'lambdalisue/gina.vim' Plug 'airblade/vim-gitgutter' Plug 'rhysd/git-messenger.vim', { 'on': 'GitMessenger' } Plug 'rhysd/conflict-marker.vim' diff --git a/nvim/.config/nvim/keymappings.vim b/nvim/.config/nvim/keymappings.vim index 55f9471..587c2ad 100644 --- a/nvim/.config/nvim/keymappings.vim +++ b/nvim/.config/nvim/keymappings.vim @@ -56,34 +56,14 @@ nnoremap ]t :tabnext nnoremap [T :tabfirst nnoremap ]T :tablast " For git -nnoremap gm :GitMessenger -nnoremap glh :Gina log --opener=split -nnoremap glv :Gina log --opener=vsplit -nnoremap gL :Gina log -nnoremap gdh :Gina diff --opener=split -nnoremap gdv :Gina diff --opener=split -nnoremap gD :Gina diff -nnoremap gs :Gina! status -nnoremap ghs :Gina status --opener=split -nnoremap gvs :Gina status --opener=vsplit -nnoremap gc :Gina commit -v -q --signoff -nnoremap gt :Gina commit -v -q --signoff %:p -nnoremap gp :Gina push -nnoremap gu :Gina push -u -nnoremap gr :Gina remote -v -nnoremap gb :Gina! branch -nnoremap gB :Gina branch -nnoremap go :Gina checkout -nnoremap g- :Gina stash:e -nnoremap g+ :Gina stash -" For gitgutter -nnoremap ]h :GitGutterNextHunk -nnoremap [h :GitGutterPrevHunk -nnoremap sh :GitGutterStageHunk -nnoremap uh :GitGutterUndoHunk -nnoremap ph :GitGutterPreviewHunk -nnoremap qh :GitGutterQuickFix -nnoremap gf :GitGutterFold +nnoremap gm :GitMessenger +nnoremap ]c :GitGutterNextHunk +nnoremap [c :GitGutterPrevHunk +nnoremap ghs :GitGutterStageHunk +nnoremap ghu :GitGutterUndoHunk +nnoremap ghp :GitGutterPreviewHunk +nnoremap ghq :GitGutterQuickFix +nnoremap ghf :GitGutterFold omap ih (GitGutterTextObjectInnerPending) omap ah (GitGutterTextObjectOuterPending) xmap ih (GitGutterTextObjectInnerVisual)