From: Jean-Noël Avila <jn.avila@free.fr>
Date: Wed, 11 Feb 2026 07:14:13 GMT
Subject: Re: [PATCH] doc: rerere-options.adoc: link to git-rerere(1)
Message-ID: <1a4060f1-6607-4b50-859d-927642eb34df@free.fr>
In-Reply-To: <doc_link_rerere.328@msgid.xyz>

Le 09/02/2026 à 19:13, kristofferhaugsbakk@fastmail.com a écrit :
> From: Kristoffer Haugsbakk <code@khaugsbakk.name>
> 
> Five commands include these options. Let’s link to the command so that
> the curious user can learn more about what “rerere” is about.
> 
> Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
> ---
> 
> Notes (series):
>     Topic name: kh/doc-link-rerere
> 
>  Documentation/rerere-options.adoc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Documentation/rerere-options.adoc b/Documentation/rerere-options.adoc
> index b0b920144a6..115882edab1 100644
> --- a/Documentation/rerere-options.adoc
> +++ b/Documentation/rerere-options.adoc
> @@ -4,6 +4,6 @@
>  	the current conflict to update the files in the working
>  	tree, allow it to also update the index with the result of
>  	resolution.  `--no-rerere-autoupdate` is a good way to
> -	double-check what `rerere` did and catch potential
> +	double-check what linkgit:git-rerere[1] did and catch potential
>  	mismerges, before committing the result to the index with a
>  	separate `git add`.
> 
> base-commit: 67ad42147a7acc2af6074753ebd03d904476118f

I'm not fond of introducing linkgit macro that can create auto-reference
in manual pages. At the moment, we need to use conditional inclusion in
the manual pages source, but I wonder if we could simply filter out the
links in the macro itself.