From: kristofferhaugsbakk@fastmail•com
To: git@vger•kernel.org
Cc: Kristoffer Haugsbakk <code@khaugsbakk•name>,
Pushkar Singh <pushkarkumarsingh1970@gmail•com>,
Patrick Steinhardt <ps@pks•im>
Subject: [PATCH v2 3/6] patch-id: use “patch ID” throughout
Date: Fri, 9 Jan 2026 15:25:59 +0100 [thread overview]
Message-ID: <V2_patch_ID_term.1b5@msgid.xyz> (raw)
In-Reply-To: <V2_CV_doc_patch-id_3.1b2@msgid.xyz>
From: Kristoffer Haugsbakk <code@khaugsbakk•name>
The “Description” section decided to introduce and use the term “patch
ID” for the ID value itself. Let’s use the same term on the options as
well.
Also make to sure to use bare “ID” instead of “id”.
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk•name>
---
Documentation/git-patch-id.adoc | 10 +++++-----
builtin/patch-id.c | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Documentation/git-patch-id.adoc b/Documentation/git-patch-id.adoc
index 82992e35fc1..9999f164b58 100644
--- a/Documentation/git-patch-id.adoc
+++ b/Documentation/git-patch-id.adoc
@@ -31,7 +31,7 @@ OPTIONS
-------
`--verbatim`::
- Calculate the patch-id of the input as it is given, do not strip
+ Calculate the patch ID of the input as it is given, do not strip
any whitespace.
+
This is the default if `patchid.verbatim` is `true`.
@@ -51,18 +51,18 @@ This is the default if `patchid.verbatim` is `true`.
or produced when an "unstable" hash (see `--unstable` below) is
configured - even when used on a diff output taken without any use
of `-O<orderfile>`, thereby making existing databases storing such
- "unstable" or historical patch-ids unusable.
+ "unstable" or historical patch IDs unusable.
-- All whitespace within the patch is ignored and does not affect the id.
+- All whitespace within the patch is ignored and does not affect the ID.
--
+
This is the default if `patchid.stable` is set to `true`.
`--unstable`::
Use an "unstable" hash as the patch ID. With this option,
- the result produced is compatible with the patch-id value produced
+ the result produced is compatible with the patch ID value produced
by Git 1.9 and older and whitespace is ignored. Users with pre-existing
- databases storing patch-ids produced by Git 1.9 and older (who do not deal
+ databases storing patch IDs produced by Git 1.9 and older (who do not deal
with reordered patches) may want to use this option.
+
This is the default.
diff --git a/builtin/patch-id.c b/builtin/patch-id.c
index d26e9d0c1ea..2781598ede6 100644
--- a/builtin/patch-id.c
+++ b/builtin/patch-id.c
@@ -228,9 +228,9 @@ int cmd_patch_id(int argc,
int opts = 0;
struct option builtin_patch_id_options[] = {
OPT_CMDMODE(0, "unstable", &opts,
- N_("use the unstable patch-id algorithm"), 1),
+ N_("use the unstable patch ID algorithm"), 1),
OPT_CMDMODE(0, "stable", &opts,
- N_("use the stable patch-id algorithm"), 2),
+ N_("use the stable patch ID algorithm"), 2),
OPT_CMDMODE(0, "verbatim", &opts,
N_("don't strip whitespace from the patch"), 3),
OPT_END()
--
2.52.0.421.gc32ead4fc78
next prev parent reply other threads:[~2026-01-09 14:27 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-08 6:28 [PATCH 0/6] doc: patch-id: six small improvements kristofferhaugsbakk
2026-01-08 6:28 ` [PATCH 1/6] doc: patch-id: don’t use semicolon between bullet points kristofferhaugsbakk
2026-01-08 6:28 ` [PATCH 2/6] doc: patch-id: capitalize Git version kristofferhaugsbakk
2026-01-08 6:28 ` [PATCH 3/6] patch-id: use “patch ID” throughout kristofferhaugsbakk
2026-01-08 6:28 ` [PATCH 4/6] doc: patch-id: use definite article for the result kristofferhaugsbakk
2026-01-08 6:28 ` [PATCH 5/6] doc: patch-id: spell out the git-diff-tree(1) form kristofferhaugsbakk
2026-01-08 6:28 ` [PATCH 6/6] doc: patch-id: --verbatim locks in --stable kristofferhaugsbakk
2026-01-08 18:15 ` Pushkar Singh
2026-01-08 18:18 ` Kristoffer Haugsbakk
2026-01-08 18:26 ` Kristoffer Haugsbakk
2026-01-09 11:38 ` [PATCH 0/6] doc: patch-id: six small improvements Patrick Steinhardt
2026-01-09 11:45 ` Kristoffer Haugsbakk
2026-01-09 14:25 ` [PATCH v2 " kristofferhaugsbakk
2026-01-09 14:25 ` [PATCH v2 1/6] doc: patch-id: don’t use semicolon between bullet points kristofferhaugsbakk
2026-01-09 14:25 ` [PATCH v2 2/6] doc: patch-id: capitalize Git version kristofferhaugsbakk
2026-01-09 14:25 ` kristofferhaugsbakk [this message]
2026-01-09 14:26 ` [PATCH v2 4/6] doc: patch-id: use definite article for the result kristofferhaugsbakk
2026-01-09 14:26 ` [PATCH v2 5/6] doc: patch-id: spell out the git-diff-tree(1) form kristofferhaugsbakk
2026-01-09 14:26 ` [PATCH v2 6/6] doc: patch-id: --verbatim locks in --stable kristofferhaugsbakk
2026-01-09 14:55 ` [PATCH v2 0/6] doc: patch-id: six small improvements Patrick Steinhardt
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_patch_ID_term.1b5@msgid.xyz \
--to=kristofferhaugsbakk@fastmail$(echo .)com \
--cc=code@khaugsbakk$(echo .)name \
--cc=git@vger$(echo .)kernel.org \
--cc=ps@pks$(echo .)im \
--cc=pushkarkumarsingh1970@gmail$(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