diff options
| author | Kristoffer Haugsbakk <code@khaugsbakk.name> | 2026-01-08 07:28:17 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-01-09 06:07:21 -0800 |
| commit | 285659cc983a60f89a60f96cff7397375766f3f8 (patch) | |
| tree | f4994e8bc5bbc80994024a21edecd5097cdd0ba1 | |
| parent | 92a61fe44dad03360141051180ace4aa39984abc (diff) | |
| download | git-285659cc983a60f89a60f96cff7397375766f3f8.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-patch-id.adoc | 10 | ||||
| -rw-r--r-- | 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 82992e35fc..9999f164b5 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 d26e9d0c1e..2781598ede 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() |