From 87d9ce0d86b0c7353a4b9cc74dd98f211e2d3923 Mon Sep 17 00:00:00 2001
From: Rob Watson <rob@netflux.io>
Date: Tue, 16 Mar 2021 09:00:59 +0100
Subject: [PATCH] Update gitconfig

---
 gitconfig | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/gitconfig b/gitconfig
index c5fd8ee..d8193ab 100644
--- a/gitconfig
+++ b/gitconfig
@@ -4,7 +4,9 @@
 [alias]
   aa = add .
   adp = add -p
+  bn = rev-parse --abbrev-ref HEAD
   br = branch
+  chp = checkout -p
   ci = commit
   co = checkout
   cp = cherry-pick
@@ -12,31 +14,33 @@
   ds = diff --staged
   f = fetch
   fixup = rebase -i --autosquash
+  mr = !git merge $(git rb)
   nuke = reset --hard
-  rc = rebase --continue
-  shp = show -p
-  st = status
-  undo = reset --soft HEAD^
-  bn = rev-parse --abbrev-ref HEAD
-  chp = checkout -p
   pl = pull
+  plr = pull --rebase
   pr = diff origin/master
   prs = diff --stat origin/master
-  rr = !git reset --hard $(git rev-parse --abbrev-ref --symbolic-full-name @{u})
+  rb = !git rev-parse --abbrev-ref --symbolic-full-name @{u}
+  rc = rebase --continue
+  rr = !git reset --hard $(git rb)
+  shp = show -p
+  s = status
+  st = status
+  undo = reset --soft HEAD^
 [user]
   email = rob@netflux.io
   name = Rob Watson
 [core]
   editor = vim
-	quotePath = false
-	commitGraph = true
+  quotePath = false
+  commitGraph = true
   pager = delta
 [color]
   ui = auto
 [pull]
-	ff = only
+  ff = only
 [init]
-	defaultBranch = development
+  defaultBranch = development
 [credential "https://github.com"]
   helper = !gh auth git-credential
 [diff]