Added git rerere autoupdate setting
Added git rerere autoupdate setting

Reference: 5082a1bf2b969ed20a2770c80d871cf616a50d01@porteneuve/fix-conflicts-only-once-with-git-rerere-7d116b2cec67

nwinkler/dotfiles,nwinkler/dotfiles