Re: [PATCH v2] doc: rerere-options.adoc: link to git-rerere(1)
On Tue, Feb 10, 2026 at 2:57 PM <kristofferhaugsbakk@fastmail.com> wrote:
Show 51 quoted lines
>
> 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.
>
> It’s also better to consistently refer to things like
> e.g. “git-subcommand(1)” over `git subcommand` or `subcommand`.
>
> Also apply the same treatment to git-add(1).
>
> Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
> ---
>
> Notes (series):
> Topic name (applied): kh/doc-rerere-options-xref
>
> v2: Same for git-add(1) and expand on the more general point of it all.
>
> Documentation/rerere-options.adoc | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/rerere-options.adoc b/Documentation/rerere-options.adoc
> index b0b920144a6..4395fe05356 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`.
> + separate linkgit:git-add[1].
>
> Interdiff against v1:
> diff --git a/Documentation/rerere-options.adoc b/Documentation/rerere-options.adoc
> index 115882edab1..4395fe05356 100644
> --- a/Documentation/rerere-options.adoc
> +++ b/Documentation/rerere-options.adoc
> @@ -6,4 +6,4 @@
> resolution. `--no-rerere-autoupdate` is a good way to
> double-check what linkgit:git-rerere[1] did and catch potential
> mismerges, before committing the result to the index with a
> - separate `git add`.
> + separate linkgit:git-add[1].
>
> base-commit: 67ad42147a7acc2af6074753ebd03d904476118f
> --
> 2.53.0.26.g2afa8602a26
Excellent, thanks for also including the rationale. LGTM!
--
D. Ben Knoble