From: Junio C Hamano Date: Sat, 09 Mar 2024 19:55:50 GMT Subject: Re: [PATCH] sequencer: allow disabling conflict advice Message-ID: In-Reply-To: <570a8736-5552-6279-4aea-8acdf8af50df@gmail.com> Philippe Blain 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.