From: "Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail•com>
To: "D. Ben Knoble" <ben.knoble@gmail•com>
Cc: git@vger•kernel.org, "Kristoffer Haugsbakk" <code@khaugsbakk•name>
Subject: Re: [PATCH] doc: rerere-options.adoc: link to git-rerere(1)
Date: Mon, 09 Feb 2026 23:23:07 +0100 [thread overview]
Message-ID: <d262682d-78d0-4990-b89f-5b8fa836e7f9@app.fastmail.com> (raw)
In-Reply-To: <CALnO6CAET9GOsNCdmd3_Jp5Qr3Rfxn8cgmu9n0N8s7uNYpCchg@mail.gmail.com>
On Mon, Feb 9, 2026, at 22:57, D. Ben Knoble wrote:
>>[snip]
>> 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`.
>
> Minor: should this adjacent be linkgit too? I thought yes, but on
> second read we really are talking about the command.
>
> Anyway, agreed that rerere should get linked. Thanks!
The `git add`? Good question. I considered it. At first it seemed like
too much of a “apply this command”, if that even makes sense. But now I
think rendering it as
separate git-add(1).
Makes sense.
Thanks for taking a look. :)
next prev parent reply other threads:[~2026-02-09 22:23 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-09 18:13 [PATCH] doc: rerere-options.adoc: link to git-rerere(1) kristofferhaugsbakk
2026-02-09 21:57 ` D. Ben Knoble
2026-02-09 22:21 ` Junio C Hamano
2026-02-09 23:12 ` Ben Knoble
2026-02-09 22:23 ` Kristoffer Haugsbakk [this message]
2026-02-10 19:56 ` [PATCH v2] " kristofferhaugsbakk
2026-02-10 21:33 ` D. Ben Knoble
2026-02-11 7:14 ` [PATCH] " Jean-Noël Avila
2026-02-11 15:43 ` Junio C Hamano
2026-02-12 5:37 ` Jean-Noël Avila
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d262682d-78d0-4990-b89f-5b8fa836e7f9@app.fastmail.com \
--to=kristofferhaugsbakk@fastmail$(echo .)com \
--cc=ben.knoble@gmail$(echo .)com \
--cc=code@khaugsbakk$(echo .)name \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox