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"