public inbox for git@vger.kernel.org
 help / color / mirror / Atom feed
From: kristofferhaugsbakk@fastmail.com
To: git@vger.kernel.org
Cc: Kristoffer Haugsbakk <code@khaugsbakk.name>, ben.knoble@gmail.com
Subject: [PATCH v2] doc: rerere-options.adoc: link to git-rerere(1)
Date: Tue, 10 Feb 2026 20:56:49 +0100	[thread overview]
Message-ID: <V2_doc_link_rerere.34f@msgid.xyz> (raw)
In-Reply-To: <doc_link_rerere.328@msgid.xyz>

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


  parent reply	other threads:[~2026-02-10 19:57 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
2026-02-10 19:56 ` kristofferhaugsbakk [this message]
2026-02-10 21:33   ` [PATCH v2] " 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=V2_doc_link_rerere.34f@msgid.xyz \
    --to=kristofferhaugsbakk@fastmail.com \
    --cc=ben.knoble@gmail.com \
    --cc=code@khaugsbakk.name \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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