From: W. Trevor King <wking@tremily.us>
Date: Thu, 19 Sep 2013 02:29:44 +0000 (-0700)
Subject: .gitconfig: Enable rerere support
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3159bf284b544c5e9c5f71b82b484f4d6862e886;p=dotfiles-public.git

.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.
---

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