Re: The git spring cleanup challenge

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 1, 2021, 22:49 UTC
Message-ID: <xmqqv96xqjyr.fsf@gitster.g>
In-Reply-To: <xmqqzgw9qky5.fsf@gitster.g>

Junio C Hamano <gitster@pobox.com> writes:

Show 10 quoted lines

> David Aguilar <davvid@gmail.com> 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.

Just to make sure, rerere.enabled is fine, but as I am not comfortable to recommend rerere.autoupdate to any human users, I would be opposed to turning it on by default. Giving people a choice is fine, but the default should be a safe one that offers users a chance of final sanity checking before proceeding.