freshlybakedca.ke
Git fork
Merge branch 'kh/doc-patch-id-markup-fix' into maint-2.51
Documentation mark-up fix.
* kh/doc-patch-id-markup-fix:
doc: patch-id: fix accidental literal blocks
+21
-18
Documentation/git-patch-id.adoc
+21
-18
Documentation/git-patch-id.adoc
···
33
33
--verbatim::
34
34
Calculate the patch-id of the input as it is given, do not strip
35
35
any whitespace.
36
-
37
-
This is the default if patchid.verbatim is true.
36
+
+
37
+
This is the default if patchid.verbatim is true.
38
38
39
39
--stable::
40
40
Use a "stable" sum of hashes as the patch ID. With this option:
41
-
- Reordering file diffs that make up a patch does not affect the ID.
42
-
In particular, two patches produced by comparing the same two trees
43
-
with two different settings for "-O<orderfile>" result in the same
44
-
patch ID signature, thereby allowing the computed result to be used
45
-
as a key to index some meta-information about the change between
46
-
the two trees;
41
+
+
42
+
--
43
+
- Reordering file diffs that make up a patch does not affect the ID.
44
+
In particular, two patches produced by comparing the same two trees
45
+
with two different settings for "-O<orderfile>" result in the same
46
+
patch ID signature, thereby allowing the computed result to be used
47
+
as a key to index some meta-information about the change between
48
+
the two trees;
47
49
48
-
- Result is different from the value produced by git 1.9 and older
49
-
or produced when an "unstable" hash (see --unstable below) is
50
-
configured - even when used on a diff output taken without any use
51
-
of "-O<orderfile>", thereby making existing databases storing such
52
-
"unstable" or historical patch-ids unusable.
50
+
- Result is different from the value produced by git 1.9 and older
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.
53
55
54
-
- All whitespace within the patch is ignored and does not affect the id.
55
-
56
-
This is the default if patchid.stable is set to true.
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.
57
60
58
61
--unstable::
59
62
Use an "unstable" hash as the patch ID. With this option,
···
61
64
by git 1.9 and older and whitespace is ignored. Users with pre-existing
62
65
databases storing patch-ids produced by git 1.9 and older (who do not deal
63
66
with reordered patches) may want to use this option.
64
-
65
-
This is the default.
67
+
+
68
+
This is the default.
66
69
67
70
GIT
68
71
---