kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'kh/doc-patch-id-markup-fix' 

Documentation mark-up fix.

* kh/doc-patch-id-markup-fix:
  doc: patch-id: fix accidental literal blocks
main
Junio C Hamano 2025-10-14 12:56:08 -07:00
parent 11f5a2264e 399694384b
commit ca5a44b15c
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Documentation/git-patch-id.adoc
View File

@ -33,27 +33,30 @@ OPTIONS
--verbatim::
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.
+
This is the default if patchid.verbatim is true.

--stable::
Use a "stable" sum of hashes as the patch ID. With this option:
- Reordering file diffs that make up a patch does not affect the ID.
In particular, two patches produced by comparing the same two trees
with two different settings for "-O<orderfile>" result in the same
patch ID signature, thereby allowing the computed result to be used
as a key to index some meta-information about the change between
the two trees;
+
--
- Reordering file diffs that make up a patch does not affect the ID.
In particular, two patches produced by comparing the same two trees
with two different settings for "-O<orderfile>" result in the same
patch ID signature, thereby allowing the computed result to be used
as a key to index some meta-information about the change between
the two trees;

- Result is different from the value produced by git 1.9 and older
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.
- Result is different from the value produced by git 1.9 and older
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.

- All whitespace within the patch is ignored and does not affect the id.

This is the default if patchid.stable is set to true.
- 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,
@ -61,8 +64,8 @@ OPTIONS
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
with reordered patches) may want to use this option.

This is the default.
+
This is the default.

GIT
---