Add "rerere" to git config for better merge conflicts resolution

2015-09-23 16:17:27 +02:00
parent 13b194e0c9
commit 61e81fa695
1 changed files with 3 additions and 1 deletions
--- a/templates/gitconfig.j2
+++ b/templates/gitconfig.j2
@@ -15,3 +15,5 @@
    excludesfile = ~/.gitignore
    editor = vim
    filemode = false
+[rerere]
+    enabled = true