Re: [PATCH] doc: rerere-options.adoc: link to git-rerere(1)

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 11, 2026, 15:43 UTC
Message-ID: <xmqqikc3waju.fsf@gitster.g>
In-Reply-To: <1a4060f1-6607-4b50-859d-927642eb34df@free.fr>

Jean-Noël Avila <jn.avila@free.fr> writes:

Show 19 quoted lines

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

FWIW, before deciding to accept the patch, I did check if git-rerere.adoc included this file (it didn't), but if we can make the macro smarter to do so, it would be great, as that would avoid people including this file there later without realizing that they now need to make the mark-up conditional.

This particular patch does not have to be blocked waiting for such an improvement, though, right?