From: Ben Knoble <ben.knoble@gmail•com>
To: Junio C Hamano <gitster@pobox•com>
Cc: kristofferhaugsbakk@fastmail•com, git@vger•kernel.org,
Kristoffer Haugsbakk <code@khaugsbakk•name>
Subject: Re: [PATCH] doc: rerere-options.adoc: link to git-rerere(1)
Date: Mon, 9 Feb 2026 18:12:16 -0500 [thread overview]
Message-ID: <A9E7502B-3AAC-4242-9BAA-47D5B4C7D151@gmail.com> (raw)
In-Reply-To: <xmqqzf5h36dc.fsf@gitster.g>
> Le 9 févr. 2026 à 17:21, Junio C Hamano <gitster@pobox•com> a écrit :
>
> "D. Ben Knoble" <ben.knoble@gmail•com> writes:
>
>>> 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!
>
> If you are happy with the end result, I would not complain, but
> which _other_ potential thing were you wondering if it should
> acquire "linkgit:"?
Doh, typo: the « git add » as Kristoffer read my mind ;)
next prev parent reply other threads:[~2026-02-09 23:12 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 [this message]
2026-02-09 22:23 ` Kristoffer Haugsbakk
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=A9E7502B-3AAC-4242-9BAA-47D5B4C7D151@gmail.com \
--to=ben.knoble@gmail$(echo .)com \
--cc=code@khaugsbakk$(echo .)name \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=kristofferhaugsbakk@fastmail$(echo .)com \
/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