From 0ae989dc8493be319387f2adc9ac176d295e7be7 Mon Sep 17 00:00:00 2001
From: Rob Watson <rob@netflux.io>
Date: Wed, 20 Oct 2021 16:23:27 +0200
Subject: [PATCH] gitconfig: Add/update aliases

---
 gitconfig | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gitconfig b/gitconfig
index 1a821c6..dfdaa0a 100644
--- a/gitconfig
+++ b/gitconfig
@@ -22,10 +22,11 @@
 	co = checkout
 	cols = !git checkout $(git branch | fzf)
 	cp = cherry-pick
+	cp2 = "!fn() { git cherry-pick $1~2..$1; }; fn"
 	cpls = !git cp $(git ls)
 	d = diff
 	dls = !git diff $(git branch | fzf)
-	dom = diff origin/master
+	dom = diff origin/master...
 	drb = !git diff $(git rb)
 	ds = diff --staged
 	f = fetch
@@ -48,7 +49,7 @@
 	pl = pull
 	plr = pull --rebase
 	ph = push -u origin HEAD
-	pr = diff origin/master
+	pr = dom
 	prs = diff --stat origin/master
 	ra = rebase --abort
 	rb = !git rev-parse --abbrev-ref --symbolic-full-name @{u}