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
Subject: [PATCH v2 0/4] doc: replay: fix config link
Date: Wed, 3 Jun 2026 18:04:21 +0200 [thread overview]
Message-ID: <V2_CV_doc_replay_config.767@msgid.xyz> (raw)
In-Reply-To: <CV_doc_replay_config.709@msgid.xyz>
From: Kristoffer Haugsbakk <code@khaugsbakk.name>
Topic name (applied): kh/doc-replay-config
Topic summary: link to the config for git-replay(1) (one variable) in
git-replay(1) and git-config(1). Also improve the doc for that config
variable and `--ref-action`.
§ Changes in v2
See the notes on the patches for more points and details.
• Keep the description list for `replay.refAction` (Junio)
• Add a comment on both description lists about the fact that
the two are similar
[1/4] doc: link to config for git-replay(1)
[2/4] doc: replay: improve config description
[3/4] doc: replay: use a nested description list
[4/4] doc: replay: move “default” to the right-hand side
Documentation/config.adoc | 2 ++
Documentation/config/replay.adoc | 19 +++++++++++++------
Documentation/git-replay.adoc | 16 ++++++++++++----
3 files changed, 27 insertions(+), 10 deletions(-)
Interdiff against v1:
diff --git a/Documentation/config/replay.adoc b/Documentation/config/replay.adoc
index 42e521694d1..40d1695782a 100644
--- a/Documentation/config/replay.adoc
+++ b/Documentation/config/replay.adoc
@@ -1,5 +1,15 @@
replay.refAction::
- Specifies the default mode for handling reference updates. Either `update` or `print`.
+ Specifies the default mode for handling reference updates.
+ The value can be:
++
+--
+////
+These use the first sentences from the description list in git-replay(1).
+////
+`update`;; (default) Update refs directly using an atomic transaction.
+`print`;; Output update-ref commands for pipeline use.
+--
++
ifdef::git-replay[]
See `--ref-action`.
endif::git-replay[]
diff --git a/Documentation/git-replay.adoc b/Documentation/git-replay.adoc
index 39ecc2e1876..ea4d14baddb 100644
--- a/Documentation/git-replay.adoc
+++ b/Documentation/git-replay.adoc
@@ -80,6 +80,9 @@ incompatible with `--contained` (which is a modifier for `--onto` only).
Control how references are updated. The mode can be:
+
--
+////
+Expanded description list compared to 'replay.refAction'.
+////
`update`;; (default) Update refs directly using an atomic transaction.
All refs are updated or none are (all-or-nothing behavior).
`print`;; Output update-ref commands for pipeline use. This is the
Range-diff against v1:
1: ef8212a076a = 1: ef8212a076a doc: link to config for git-replay(1)
2: 7e915e331b5 ! 2: b60e2e02826 doc: replay: simplify replay.refAction description
@@ Metadata
Author: Kristoffer Haugsbakk <code@khaugsbakk.name>
## Commit message ##
- doc: replay: simplify replay.refAction description
+ doc: replay: improve config description
- We don’t need to list what each argument does since the documentation
- for `--ref-action` does that. So let’s simplify the `replay.refAction`
- description by referring to git-replay(1).
+ First of all, this bullet list for `--ref-action` introduces a term with
+ a colon. This is exactly what a description list is, structurally. Let’s
+ be sylistically consistent and use the description list markup
+ construct. Let’s also drop the harmless but unneeded indentation.
- Also make sure to not self-link for the git-replay(1) inclusion.
+ 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>
@@ Documentation/config/replay.adoc
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.
-+ Specifies the default mode for handling reference updates. Either `update` or `print`.
+ifdef::git-replay[]
+See `--ref-action`.
+endif::git-replay[]
3: 30952387f35 ! 3: d13cd39cb36 doc: replay: use a nested definition list
@@ Metadata
Author: Kristoffer Haugsbakk <code@khaugsbakk.name>
## Commit message ##
- doc: replay: use a nested definition list
+ doc: replay: use a nested description list
This bullet list for `--ref-action` introduces a term with a colon.
- This is exactly what a definition list is, structurally. Let’s be
- sylistically consistent and use the definition list markup construct.
+ This is exactly what a description list is, structurally. Let’s be
+ sylistically consistent and use the desc. list markup construct.[1]
We can reuse the `::` delimiter since we use an open block.
- But for consistency use the typical nested definition list
+ But for consistency use the typical nested description list
delimiter, namely `;;`.
Also drop the harmless but unneeded indentation.
+ † 1: Same explanation as in the previous commit
+
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
## Documentation/git-replay.adoc ##
4: 71a61bc0ed4 < -: ----------- doc: replay: move “default” to the right-hand-side
-: ----------- > 4: 17804ea7afa doc: replay: move “default” to the right-hand side
base-commit: a89346e34a937f001e5d397ee62224e3e9852040
--
2.54.0.22.g9e26862b904
next prev parent reply other threads:[~2026-06-03 16:04 UTC|newest]
Thread overview: 17+ 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-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 ` kristofferhaugsbakk [this message]
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-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
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_CV_doc_replay_config.767@msgid.xyz \
--to=kristofferhaugsbakk@fastmail.com \
--cc=code@khaugsbakk.name \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox