diff --git a/nvim/.config/nvim/after/plugin/fugitive.vim b/nvim/.config/nvim/after/plugin/fugitive.vim
index 95758d2..54f86b3 100644
--- a/nvim/.config/nvim/after/plugin/fugitive.vim
+++ b/nvim/.config/nvim/after/plugin/fugitive.vim
@@ -1,18 +1,21 @@
+nnoremap <Leader>ga :Git fetch --all<CR>
 nnoremap <Leader>gl :0Gclog!<CR>
 nnoremap <Leader>gL :Gclog!<CR>
 nnoremap <Leader>gd :Ghdiffsplit!<CR>
 nnoremap <Leader>gD :Gvdiffsplit!<CR>
 nnoremap <Leader>gs :Git<CR>
+nnoremap <Leader>gS :Git<SPACE>
 nnoremap <Leader>gc :Git commit -v -q --signoff<CR>
-nnoremap <Leader>gt :Git commit -v -q --signoff %:p<CR>
+nnoremap <Leader>gC :Git commit -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 -a<CR>
-nnoremap <Leader>gB :Git branch<SPACE>
-nnoremap <Leader>go :Git checkout<SPACE>
+nnoremap <Leader>gP :Git push -u<SPACE>
 nnoremap <Leader>g- :Git stash<CR>:e<CR>
 nnoremap <Leader>g+ :Git stash pop<CR>:e<CR>
 nnoremap <Leader>gw :Gwrite<CR>
-nnoremap <Leader>gG :Git<SPACE>
 nnoremap <Leader>gM :0,3Git blame<CR>
+nnoremap <Leader>gr :Git rebase origin/master<CR>
+nnoremap <Leader>gR :Git rebase upstream/master<CR>
+
+" For 3 way merge
+nnoremap <Leader>dl :diffget //2<CR>
+nnoremap <Leader>dr :diffget //3<CR>
diff --git a/nvim/.config/nvim/after/plugin/fzf_checkout.vim b/nvim/.config/nvim/after/plugin/fzf_checkout.vim
new file mode 100644
index 0000000..e46e3cf
--- /dev/null
+++ b/nvim/.config/nvim/after/plugin/fzf_checkout.vim
@@ -0,0 +1,9 @@
+nnoremap <Leader>gbo :GBranches checkout<CR>
+nnoremap <Leader>gbt :GBranches track<CR>
+nnoremap <Leader>gbc :GBranches create<SPACE>
+nnoremap <Leader>gbd :GBranches delete<CR>
+nnoremap <Leader>gbm :GBranches merge<CR>
+
+nnoremap <Leader>gto :GTags checkout<CR>
+nnoremap <Leader>gtc :GTags create<SPACE>
+nnoremap <Leader>gtd :GTags delete<CR>