all repos — nixfiles @ 72303ddc158dc7aa26fe041e9be646bca857babd

System and user configuration, managed by nix and home-manager

Git: Remember merge conflict resolutions
Alan Pearce alan.pearce@spotcap.com
Thu, 17 Dec 2015 09:03:36 +0100
commit

72303ddc158dc7aa26fe041e9be646bca857babd

parent

eac4c6007a802ba7d430283888aa3a03d4844751

1 files changed, 2 insertions(+), 0 deletions(-)

jump to
M tag-git/config/git/configtag-git/config/git/config
@@ -30,3 +30,5 @@ [core] 	excludesfile = ~/.config/git/ignore
 [rebase]
 	autosquash = true
+[rerere]
+	enabled = true