all repos — archive/dotfiles @ 72303ddc158dc7aa26fe041e9be646bca857babd

Superseded by nixfiles

Git: Remember merge conflict resolutions

Alan Pearce
commit

72303ddc158dc7aa26fe041e9be646bca857babd

parent

eac4c6007a802ba7d430283888aa3a03d4844751

1 file 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