From 3159bf284b544c5e9c5f71b82b484f4d6862e886 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Wed, 18 Sep 2013 19:29:44 -0700
Subject: [PATCH] .gitconfig: Enable rerere support

Re-merging and re-rebasing are not fun when you have to keep repeating
your previous conflict resolution.  See git-rerere(1) for details.
---
 src/.gitconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/.gitconfig b/src/.gitconfig
index cac6f3a..5b59932 100644
--- a/src/.gitconfig
+++ b/src/.gitconfig
@@ -24,6 +24,9 @@
 	textconv = gpg -v
 	xfuncname = "^((pub|uid) .*)"
 
+[rerere]
+	enabled = true
+
 [alias]
 	authors = shortlog -se
 	glog = log --graph --topo-order --oneline --decorate
-- 
2.26.2