Skip to content

Commit 285659c

Browse files
LemmingAvalanchegitster
authored andcommitted
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>
1 parent 92a61fe commit 285659c

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

Documentation/git-patch-id.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ OPTIONS
3131
-------
3232

3333
`--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
3535
any whitespace.
3636
+
3737
This is the default if `patchid.verbatim` is `true`.
@@ -51,18 +51,18 @@ This is the default if `patchid.verbatim` is `true`.
5151
or produced when an "unstable" hash (see `--unstable` below) is
5252
configured - even when used on a diff output taken without any use
5353
of `-O<orderfile>`, thereby making existing databases storing such
54-
"unstable" or historical patch-ids unusable.
54+
"unstable" or historical patch IDs unusable.
5555
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.
5757
--
5858
+
5959
This is the default if `patchid.stable` is set to `true`.
6060
6161
`--unstable`::
6262
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
6464
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
6666
with reordered patches) may want to use this option.
6767
+
6868
This is the default.

builtin/patch-id.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,9 @@ int cmd_patch_id(int argc,
228228
int opts = 0;
229229
struct option builtin_patch_id_options[] = {
230230
OPT_CMDMODE(0, "unstable", &opts,
231-
N_("use the unstable patch-id algorithm"), 1),
231+
N_("use the unstable patch ID algorithm"), 1),
232232
OPT_CMDMODE(0, "stable", &opts,
233-
N_("use the stable patch-id algorithm"), 2),
233+
N_("use the stable patch ID algorithm"), 2),
234234
OPT_CMDMODE(0, "verbatim", &opts,
235235
N_("don't strip whitespace from the patch"), 3),
236236
OPT_END()

0 commit comments

Comments
 (0)