From: Kristoffer Haugsbakk <code@khaugsbakk.name>
The options here are apparently written with the assumption that you can continue a block like e.g. a description list by maintaining the same indentation level. This is not the the case; you need to use list continuation (+) for the elements following the first paragraph if you want to be guaranteed a predictable output
This is kind of subtle since only the last paragraph of each option gets rendered in an unintended way, namely as literal blocks. This is easier to see in the HTML output since the man page output just has a slightly larger indentation on these paragraphs.
Let’s use list continuation throughout, collapse the indentation in front of all paragraphs except the first one, and wrap the unordered list in an open block (`--`).
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name> --- Documentation/git-patch-id.adoc | 43 ++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 20 deletions(-)
Show changes to Documentation/git-patch-id.adoc +23 −20
diff --git a/Documentation/git-patch-id.adoc b/Documentation/git-patch-id.adoc index 1d15fa45d51..45da0f27acd 100644 --- a/Documentation/git-patch-id.adoc +++ b/Documentation/git-patch-id.adoc @@ -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; - - - 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. ++ +-- +- 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. + +- 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 --- base-commit: c44beea485f0f2feaf460e2ac87fdd5608d63cf0
-- 2.51.0.327.gddebdc8c038
