Re: [PATCH v2 1/2] sequencer: allow disabling conflict advice

From: Philippe Blain <levraiphilippeblain@gmail.com>
Date: Mar 16, 2024, 19:33 UTC
Message-ID: <6051365b-7ebd-b63b-2ece-4fc072a001e5@gmail.com>
In-Reply-To: <15049e66-09b8-4baf-887d-e9118b9cd175@app.fastmail.com>

Hi Kristoffer,

Le 2024-03-11 à 06:29, Kristoffer Haugsbakk a écrit :

Show 19 quoted lines

> Hi Philippe
> 
> On Sun, Mar 10, 2024, at 20:51, Philippe Blain via GitGitGadget wrote:
>> diff --git a/Documentation/config/advice.txt
>> b/Documentation/config/advice.txt
>> index c7ea70f2e2e..a1178284b23 100644
>> --- a/Documentation/config/advice.txt
>> +++ b/Documentation/config/advice.txt
>> @@ -56,6 +56,8 @@ advice.*::
>>  		Advice on how to set your identity configuration when
>>  		your information is guessed from the system username and
>>  		domain name.
>> +	mergeConflict::
>> +		Advice shown when various commands stop because of conflicts.
> 
> Given that topic kh/branch-ref-syntax-advice is in `next`, maybe this
> should be changed to “Shown when”?[1]
> 
> 🔗 1: https://lore.kernel.org/git/7017ff3fff773412e8c472d8e59a132b0e8faae7.1709670287.git.code@khaugsbakk.name/

Thanks for the pointer, I will change that for uniformity in that section of the doc.

Cheers, Philippe.