From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 09 Mar 2024 23:19:44 GMT
Subject: Re: [PATCH] sequencer: allow disabling conflict advice
Message-ID: <xmqqh6hf0z8v.fsf@gitster.g>
In-Reply-To: <xmqqle6rch89.fsf@gitster.g>

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

> Philippe Blain <levraiphilippeblain@gmail.com> writes:
>
>> Thinking about this more and looking at the code, using 'advice_enabled' in the condition
>> instead of using 'advise_if_enabled' for each message has a side effect:
>> the text "hint: Disable this message with "git config advice.sequencerConflict false"
>> will not appear, which I find less user friendly...
>
> Good eyes.
>
> I agree that you have to do that part yourself at the end of that
> "if () { ... }" block using turn_off_instructions[] string.

Forgot to add "... which is an unnecessary chore" at the end.

Thanks.