From 570b8a5b5eb3883c9a5022002c5b42f520cbce36 Mon Sep 17 00:00:00 2001
From: Rob Watson <rob@netflux.io>
Date: Thu, 22 Apr 2021 11:41:53 +0200
Subject: [PATCH] Update Git aliases and vimrc

---
 gitconfig | 2 ++
 vimrc     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/gitconfig b/gitconfig
index e75ddda..cf1c326 100644
--- a/gitconfig
+++ b/gitconfig
@@ -16,7 +16,9 @@
 	ds = diff --staged
 	f = fetch
 	fixup = rebase -i --autosquash
+	fixom = rebase -i --autosquash origin/master
 	mr = !git merge $(git rb)
+	nb = checkout -b
 	nuke = reset --hard
 	p = push
 	poh = push -u origin HEAD
diff --git a/vimrc b/vimrc
index e735cd6..7f2ac9c 100644
--- a/vimrc
+++ b/vimrc
@@ -155,7 +155,7 @@ function! OpenGitURLToLineOrRange() range
   endif
 endfunction
 
-nnoremap <leader>ab :Gblame<cr>
+nnoremap <leader>ab :Git blame<cr>
 nnoremap <leader>as :Gstatus<cr>
 nnoremap <leader>ac :Commits<cr>
 nnoremap <leader>ah :GitGutterLineHighlightsToggle<cr>