From f4fcd2e08a09a4638595490293ac55ff02d7a2f9 Mon Sep 17 00:00:00 2001
From: Danielle McLean <dani@00dani.me>
Date: Fri, 27 Mar 2020 14:16:06 +1100
Subject: [PATCH] Switch from --rebase=preserve, which is deprecated, to
 --rebase=merges

---
 config/git/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/git/config b/config/git/config
index a0bbf7c..451cef1 100644
--- a/config/git/config
+++ b/config/git/config
@@ -8,7 +8,7 @@
 	co = checkout
 	d = diff
 	l = log --graph --pretty=graph --date=relative
-	up = pull --prune --rebase=preserve --autostash
+	up = pull --prune --rebase=merges --autostash
 	patch = !git --no-pager diff --no-color
 	st = status --short
 	shove = "!f() { git push ${1:-origin} :; }; f"