~mdw / profile / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 436a076)
dot/gitconfig.in: Stage merge conflicts fixed up by `git-rerere'.
authorMark Wooding <mdw@distorted.org.uk>
Thu, 23 Feb 2012 10:33:55 +0000 (10:33 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Thu, 23 Feb 2012 10:33:55 +0000 (10:33 +0000)
dot/gitconfig.in patch | blob | blame | history

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 77976f9..e53b153 100644 (file)
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -98,6 +98,7 @@
 
 [rerere]
        enabled = yes
+       autoupdate = yes
 
 [stgit]
        autoresolved = yes
Dotfiles and other configuration.