Re: The git spring cleanup challenge

David Aguilar [off-list ref] writes:

+1 for merge.conflictstyle = diff3, rerere.enabled = true, and
log.decorate = short from me. I noticed others already mentioned
these.

As the inventor of rerere, I agree on rerere.enabled.  It was made
opt-in only because I thought it was somewhat risky when the feature
was introduced, but it has been stable and useful, and it is long
overdue to be enabled by default.

I do not think of any downside with conflictstyle being diff3 (and
think of only upside).  As to log.decorate, I see it as mostly
personal preference and the current default of "auto" seems more
appropriate.