From a20fa4494c34a2a65a9c47ced8912e7681778b6a Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <maitysanchayan@gmail.com>
Date: Tue, 26 May 2020 11:00:22 +0530
Subject: [PATCH] nvim: Update to some keymappings for git and drop gina

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
---
 .../.config/nvim/after/ftplugin/gitcommit.vim |  4 +--
 nvim/.config/nvim/init.vim                    |  1 -
 nvim/.config/nvim/keymappings.vim             | 36 +++++--------------
 3 files changed, 10 insertions(+), 31 deletions(-)

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 <buffer> [d ?^@@<CR>
-nnoremap <buffer> ]d /^@@<CR>
+nnoremap <buffer> [c ?^@@<CR>
+nnoremap <buffer> ]c /^@@<CR>
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<CR>
 nnoremap [T :tabfirst<CR>
 nnoremap ]T :tablast<CR>
 " For git
-nnoremap <Leader>gm  :GitMessenger<CR>
-nnoremap <Leader>glh :Gina log --opener=split<CR>
-nnoremap <Leader>glv :Gina log --opener=vsplit<CR>
-nnoremap <Leader>gL  :Gina log<SPACE>
-nnoremap <Leader>gdh :Gina diff --opener=split<CR>
-nnoremap <Leader>gdv :Gina diff --opener=split<CR>
-nnoremap <Leader>gD  :Gina diff<SPACE>
-nnoremap <Leader>gs  :Gina! status<CR>
-nnoremap <Leader>ghs :Gina status --opener=split<CR>
-nnoremap <Leader>gvs :Gina status --opener=vsplit<CR>
-nnoremap <Leader>gc  :Gina commit -v -q --signoff<CR>
-nnoremap <Leader>gt  :Gina commit -v -q --signoff %:p<CR>
-nnoremap <Leader>gp  :Gina push<CR>
-nnoremap <Leader>gu  :Gina push -u<SPACE>
-nnoremap <Leader>gr  :Gina remote -v<CR>
-nnoremap <Leader>gb  :Gina! branch<CR>
-nnoremap <Leader>gB  :Gina branch<SPACE>
-nnoremap <Leader>go  :Gina checkout<SPACE>
-nnoremap <Leader>g-  :Gina stash<CR>:e<CR>
-nnoremap <Leader>g+  :Gina stash<SPACE>
-" For gitgutter
-nnoremap ]h :GitGutterNextHunk<CR>
-nnoremap [h :GitGutterPrevHunk<CR>
-nnoremap <Leader>sh :GitGutterStageHunk<CR>
-nnoremap <Leader>uh :GitGutterUndoHunk<CR>
-nnoremap <Leader>ph :GitGutterPreviewHunk<CR>
-nnoremap <Leader>qh :GitGutterQuickFix<CR>
-nnoremap <Leader>gf :GitGutterFold<CR>
+nnoremap <Leader>gm :GitMessenger<CR>
+nnoremap ]c :GitGutterNextHunk<CR>
+nnoremap [c :GitGutterPrevHunk<CR>
+nnoremap ghs :GitGutterStageHunk<CR>
+nnoremap ghu :GitGutterUndoHunk<CR>
+nnoremap ghp :GitGutterPreviewHunk<CR>
+nnoremap ghq :GitGutterQuickFix<CR>
+nnoremap ghf :GitGutterFold<CR>
 omap ih <Plug>(GitGutterTextObjectInnerPending)
 omap ah <Plug>(GitGutterTextObjectOuterPending)
 xmap ih <Plug>(GitGutterTextObjectInnerVisual)