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

From: Kristoffer Haugsbakk <code@khaugsbakk.name>
Date: Mar 11, 2024, 10:29 UTC
Message-ID: <15049e66-09b8-4baf-887d-e9118b9cd175@app.fastmail.com>
In-Reply-To: <a2ce6fd24c270fcc89439cd7d119c701dd262ec5.1710100261.git.gitgitgadget@gmail.com>

Hi Philippe

On Sun, Mar 10, 2024, at 20:51, Philippe Blain via GitGitGadget wrote:

Show 11 quoted lines

> 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/

>  	nestedTag::
>  		Advice shown if a user attempts to recursively tag a tag object.
>  	pushAlreadyExists::