From: kristofferhaugsbakk@fastmail.com
To: Junio C Hamano <gitster@pobox.com>
Cc: Kristoffer Haugsbakk <code@khaugsbakk.name>,
Siddharth Asthana <siddharthasthana31@gmail.com>,
git@vger.kernel.org, Patrick Steinhardt <ps@pks.im>
Subject: [PATCH v3 2/4] doc: replay: improve config description
Date: Fri, 5 Jun 2026 15:56:00 +0200 [thread overview]
Message-ID: <V3_doc_replay_improve_config.782@msgid.xyz> (raw)
In-Reply-To: <V3_CV_doc_replay_config.780@msgid.xyz>
From: Kristoffer Haugsbakk <code@khaugsbakk.name>
First of all, this unordered list for `replay.refAction` introduces
a term with a colon. This is exactly what a description list is,
structurally. Let’s be stylistically consistent and use the desc.
list markup construct. Let’s also drop the harmless but unneeded
indentation.
We can reuse the `::` delimiter since we use an open block.
But for consistency use the typical nested description list
delimiter, namely `;;`.
Second, let’s replace the inline-verbatim `git replay` with a link
to git-replay(1), since we are naming the command. But make that
conditional so that we avoid a self-link inside git-replay(1).[1]
† 1: See e.g. e7b3a768 (doc: git-init: rework config item
init.templateDir, 2024-03-10) for another example of
avoiding self-linking
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
---
Notes (series):
v3:
• Msg:[1] typo, fix to “stylistically”
• Msg: Move the paragraph about delimiters (;;) from the *next*
patch over here instead. This is the first place we do it. In the
next patch we can just say that we are doing the same trans-
formation as here.
• Msg: Remove double-space to separate two sentences. That’s
inconsitent for me. I moved away from that because two-space
separation takes up too much space when linewrapping is set to 72.
• Msg: This isn’t the option, it is `replay.refAction`
• Copy–paste mistake? We don’t have to ask
• Msg: ... and it’s better to call it an unordered list rather than
bullet points
† 1: Commit message
---
v2:
• Keep the description list for `replay.refAction` (Junio)
• Now rewrite the description list like in patch 1/3 (it’s
technically an unordered list)
• Msg: mention a previous commit which also avoided self-linking.
This helps establish a bit more context for why we do this.
Documentation/config/replay.adoc | 16 ++++++++++------
Documentation/git-replay.adoc | 1 +
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/Documentation/config/replay.adoc b/Documentation/config/replay.adoc
index 7d549d2f0e5..7328da9537d 100644
--- a/Documentation/config/replay.adoc
+++ b/Documentation/config/replay.adoc
@@ -1,11 +1,15 @@
replay.refAction::
- Specifies the default mode for handling reference updates in
- `git replay`. The value can be:
+ Specifies the default mode for handling reference updates.
+ The value can be:
+
--
- * `update`: Update refs directly using an atomic transaction (default behavior).
- * `print`: Output update-ref commands for pipeline use.
+`update`;; Update refs directly using an atomic transaction (default behavior).
+`print`;; Output update-ref commands for pipeline use.
--
+
-This setting can be overridden with the `--ref-action` command-line option.
-When not configured, `git replay` defaults to `update` mode.
+ifdef::git-replay[]
+See `--ref-action`.
+endif::git-replay[]
+ifndef::git-replay[]
+See `--ref-action` for linkgit:git-replay[1] for details.
+endif::git-replay[]
diff --git a/Documentation/git-replay.adoc b/Documentation/git-replay.adoc
index f9ca2db2833..4de85088d6c 100644
--- a/Documentation/git-replay.adoc
+++ b/Documentation/git-replay.adoc
@@ -211,6 +211,7 @@ to use bare commit IDs instead of branch names.
CONFIGURATION
-------------
+:git-replay: 1
include::config/replay.adoc[]
GIT
--
2.54.0.22.g9e26862b904
next prev parent reply other threads:[~2026-06-05 13:56 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-21 18:01 [PATCH 0/4] doc: replay: fix config link kristofferhaugsbakk
2026-05-21 18:01 ` [PATCH 1/4] doc: link to config for git-replay(1) kristofferhaugsbakk
2026-05-30 22:18 ` Junio C Hamano
2026-06-04 20:38 ` Kristoffer Haugsbakk
2026-05-21 18:01 ` [PATCH 2/4] doc: replay: simplify replay.refAction description kristofferhaugsbakk
2026-05-30 22:29 ` Junio C Hamano
2026-05-30 22:37 ` Junio C Hamano
2026-06-02 11:58 ` Kristoffer Haugsbakk
2026-05-21 18:02 ` [PATCH 3/4] doc: replay: use a nested definition list kristofferhaugsbakk
2026-05-30 22:37 ` Junio C Hamano
2026-05-21 18:02 ` [PATCH 4/4] doc: replay: move “default” to the right-hand-side kristofferhaugsbakk
2026-05-30 22:37 ` Junio C Hamano
2026-05-30 22:18 ` [PATCH 0/4] doc: replay: fix config link Junio C Hamano
2026-06-03 16:04 ` [PATCH v2 " kristofferhaugsbakk
2026-06-03 16:04 ` [PATCH v2 1/4] doc: link to config for git-replay(1) kristofferhaugsbakk
2026-06-03 16:04 ` [PATCH v2 2/4] doc: replay: improve config description kristofferhaugsbakk
2026-06-04 6:27 ` Patrick Steinhardt
2026-06-04 6:31 ` Kristoffer Haugsbakk
2026-06-04 9:05 ` Patrick Steinhardt
2026-06-03 16:04 ` [PATCH v2 3/4] doc: replay: use a nested description list kristofferhaugsbakk
2026-06-03 16:04 ` [PATCH v2 4/4] doc: replay: move “default” to the right-hand side kristofferhaugsbakk
2026-06-05 13:55 ` [PATCH v3 0/4] doc: replay: fix config link kristofferhaugsbakk
2026-06-05 13:55 ` [PATCH v3 1/4] doc: link to config for git-replay(1) kristofferhaugsbakk
2026-06-05 13:56 ` kristofferhaugsbakk [this message]
2026-06-05 13:56 ` [PATCH v3 3/4] doc: replay: use a nested description list kristofferhaugsbakk
2026-06-05 13:56 ` [PATCH v3 4/4] doc: replay: move “default” to the right-hand side kristofferhaugsbakk
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=V3_doc_replay_improve_config.782@msgid.xyz \
--to=kristofferhaugsbakk@fastmail.com \
--cc=code@khaugsbakk.name \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ps@pks.im \
--cc=siddharthasthana31@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.