diff --git a/config/git/config b/config/git/config
index f7a29a3..fa9a2a0 100644
--- a/config/git/config
+++ b/config/git/config
@@ -14,3 +14,8 @@
 
 [url "git@github.com:"]
 	pushInsteadOf = https://github.com/
+
+[git-up.rebase]
+	arguments = --preserve-merges
+[rerere]
+	enabled = true