git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
D. Ben Knoble <ben.knoble@gmail.com>
Date
Feb 10, 2026, 21:33 UTC
Message-ID
<CALnO6CDxOPXuFMp4Us8cvbF5FZeT74fSKDFy5Wd7D4jmF9=QAQ@mail.gmail.com>
In-Reply-To
<V2_doc_link_rerere.34f@msgid.xyz>
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
Previous: kristofferhaugsbakk@fastmail.comNext: Jean-Noël Avila
Message 7 of 10 in “doc: rerere-options.adoc: link to git-rerere(1)”
  1. doc: rerere-options.adoc: link to git-rerere(1)kristofferhaugsbakk@fastmail.com, Feb 9, 2026
  2. D. Ben KnobleFeb 9, 2026
  3. Junio C HamanoFeb 9, 2026
  4. Ben KnobleFeb 9, 2026
  5. Kristoffer HaugsbakkFeb 9, 2026
  6. doc: rerere-options.adoc: link to git-rerere(1)kristofferhaugsbakk@fastmail.com, Feb 10, 2026
  7. D. Ben KnobleFeb 10, 2026
  8. Jean-Noël AvilaFeb 11, 2026
  9. Junio C HamanoFeb 11, 2026
  10. Jean-Noël AvilaFeb 12, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.