From c0f087d8e2d15eaa420ceffa5a047a669c3683eb Mon Sep 17 00:00:00 2001
From: Danielle McLean <gopsychonauts@gmail.com>
Date: Fri, 18 Nov 2016 09:47:20 +1100
Subject: [PATCH] Make conflicts easier to handle by preserving merges on
 rebase and enabling rerere

---
 config/git/config | 5 +++++
 1 file changed, 5 insertions(+)

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