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

M .gitconfig

@@ 30,6 30,7 @@
 
 [branch]
   autosetupmerge = always
+  sort = -committerdate
 
 [status]
   submoduleSummary = true


@@ 52,6 53,9 @@
 [merge]
   conflictstyle = zdiff3
 
+[rerere]
+  enabled = true
+
 [fetch]
   prune = true