summary refs log tree commit diff stats
path: root/tag-git
diff options
context:
space:
mode:
authorAlan Pearce2015-12-17 09:03:36 +0100
committerAlan Pearce2015-12-17 09:03:36 +0100
commit72303ddc158dc7aa26fe041e9be646bca857babd (patch)
tree8e67a22e4e358a811d76cf6191ec3fbe27ed7bad /tag-git
parenteac4c6007a802ba7d430283888aa3a03d4844751 (diff)
downloadnixfiles-72303ddc158dc7aa26fe041e9be646bca857babd.tar.lz
nixfiles-72303ddc158dc7aa26fe041e9be646bca857babd.tar.zst
nixfiles-72303ddc158dc7aa26fe041e9be646bca857babd.zip
Git: Remember merge conflict resolutions
Diffstat (limited to 'tag-git')
-rw-r--r--tag-git/config/git/config2
1 files changed, 2 insertions, 0 deletions
diff --git a/tag-git/config/git/config b/tag-git/config/git/config
index 29222857..3d6b82a2 100644
--- a/tag-git/config/git/config
+++ b/tag-git/config/git/config
@@ -30,3 +30,5 @@
 	excludesfile = ~/.config/git/ignore
 [rebase]
 	autosquash = true
+[rerere]
+	enabled = true