From b083b68e4fbd06ca6820b9c131ae3780dcbd1da1 Mon Sep 17 00:00:00 2001
From: Danielle McLean <dani@00dani.me>
Date: Thu, 15 Mar 2018 11:38:12 +1100
Subject: [PATCH] Remove deprecated git-up configuration and port it across to
 the current 'up' alias

---
 config/git/config | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/config/git/config b/config/git/config
index ab96c36..096c4c4 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 --rebase --autostash
+	up = pull --rebase=preserve --autostash
 	st = status --short
 	shove = "!f() { git push ${1:-origin} :; }; f"
 
@@ -21,9 +21,6 @@
 	process = git-lfs filter-process
 	required = true
 
-[git-up.rebase]
-	arguments = --preserve-merges
-
 [gpg]
 	program = gpg-for-git-signing