patch-id: use “patch ID” throughout
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Kristoffer Haugsbakk committed
Jan 8, 2026 at 07:28 UTC
285659cc983a60f89a60f96cff7397375766f3f8
2 files changed
+7
-7
Documentation/git-patch-id.adoc
+5
-5
@@ -31,7 +31,7 @@ OPTIONS
31
-------
32
33
`--verbatim`::
34
- Calculate the patch-id of the input as it is given, do not strip
34
+ Calculate the patch ID of the input as it is given, do not strip
35
any whitespace.
36
+
37
This is the default if `patchid.verbatim` is `true`.
@@ -51,18 +51,18 @@ This is the default if `patchid.verbatim` is `true`.
51
or produced when an "unstable" hash (see `--unstable` below) is
52
configured - even when used on a diff output taken without any use
53
of `-O<orderfile>`, thereby making existing databases storing such
54
- "unstable" or historical patch-ids unusable.
54
+ "unstable" or historical patch IDs unusable.
55
56
-- All whitespace within the patch is ignored and does not affect the id.
56
+- All whitespace within the patch is ignored and does not affect the ID.
57
--
58
+
59
This is the default if `patchid.stable` is set to `true`.
60
61
`--unstable`::
62
Use an "unstable" hash as the patch ID. With this option,
63
- the result produced is compatible with the patch-id value produced
63
+ the result produced is compatible with the patch ID value produced
64
by Git 1.9 and older and whitespace is ignored. Users with pre-existing
65
- databases storing patch-ids produced by Git 1.9 and older (who do not deal
65
+ databases storing patch IDs produced by Git 1.9 and older (who do not deal
66
with reordered patches) may want to use this option.
67
+
68
This is the default.
builtin/patch-id.c
+2
-2
@@ -228,9 +228,9 @@ int cmd_patch_id(int argc,
228
int opts = 0;
229
struct option builtin_patch_id_options[] = {
230
OPT_CMDMODE(0, "unstable", &opts,
231
- N_("use the unstable patch-id algorithm"), 1),
231
+ N_("use the unstable patch ID algorithm"), 1),
232
OPT_CMDMODE(0, "stable", &opts,
233
- N_("use the stable patch-id algorithm"), 2),
233
+ N_("use the stable patch ID algorithm"), 2),
234
OPT_CMDMODE(0, "verbatim", &opts,
235
N_("don't strip whitespace from the patch"), 3),
236
OPT_END()