From 47739fc25635a020071bdd6ca2c90c5b1d70302e Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <maitysanchayan@gmail.com>
Date: Thu, 5 Dec 2019 13:56:29 +0530
Subject: [PATCH] nvim: init.vim: Miscellaneous additions & improvements

---
 nvim/init.vim | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/nvim/init.vim b/nvim/init.vim
index 27dba95..6e505cf 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -231,13 +231,22 @@ nnoremap <Leader>tp :bp<CR>
 nnoremap <Leader>vr :so %<CR>
 " For git
 nnoremap <Leader>gm :GitMessenger<CR>
-nnoremap <Leader>gl :Glog<CR>
-nnoremap <Leader>gd :Gdiffsplit<CR>
+nnoremap <Leader>gl :0Glog<CR>
+nnoremap <Leader>gL :Glog<CR>
+nnoremap <Leader>gd :Gdiff<CR>
+nnoremap <Leader>gD :Gdiffsplit<CR>
 nnoremap <Leader>gs :Gstatus<CR>
-nnoremap <Leader>gc :Gcommit --signoff<CR>
-nnoremap <Leader>gp :Git! push<CR>
-nnoremap <Leader>gu :Git! push -u
-nnoremap <Leader>gr :Git! remote -v<CR>
+nnoremap <Leader>gc :Gcommit -v -q --signoff<CR>
+nnoremap <Leader>gt :Gcommit -v -q --signoff %:p<CR>
+nnoremap <Leader>gp :Git push<CR>
+nnoremap <Leader>gu :Git push -u<SPACE>
+nnoremap <Leader>gr :Git remote -v<CR>
+nnoremap <Leader>gb :Git branch<SPACE>
+nnoremap <Leader>go :Git checkout<SPACE>
+nnoremap <Leader>g- :Git stash<CR>:e<CR>
+nnoremap <Leader>g+ :Git stash pop<CR>:e<CR>
+nnoremap <Leader>gf :exe ':Ggrep ' . expand('<cword>')<CR>
+nnoremap <Leader>gF :Ggrep<SPACE>
 " For gitgutter
 nnoremap <Leader>ghn :GitGutterNextHunk<CR>
 nnoremap <Leader>ghp :GitGutterPrevHunk<CR>
@@ -253,10 +262,10 @@ nnoremap <Leader>cr :cs reset<CR>
 " For Neomake
 nnoremap <Leader>nm  :Neomake<CR>
 nnoremap <Leader>nc  :NeomakeClean<CR>
-nnoremap <Leader>ns  :NeomakeSh
+nnoremap <Leader>ns  :NeomakeSh<SPACE>
 nnoremap <Leader>njl :NeomakeListJobs<CR>
 nnoremap <Leader>nja :NeomakeCancelJobs<CR>
-nnoremap <Leader>njc :NeomakeCancelJob
+nnoremap <Leader>njc :NeomakeCancelJob<SPACE>
 " For workspace
 nnoremap <Leader>sw  :ToggleWorkspace<CR>
 
@@ -571,5 +580,5 @@ function! CscopeQuery(option)
 endfunction
 
 function! NvimGdbNoTKeymaps()
-  tnoremap <silent> <buffer> <esc> <c-\><c-n>
+  tnoremap <silent> <buffer> <Esc> <C-\><C-n>
 endfunction