diff, log doc: small grammer, format, and language fixes
- Replace "SHA-1" by "object name", the modern name for hashes. - Correct a few grammar weaknesses. - Do not accidentally format a phrase in teletype font where quotes are intended. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Sixt committed
Sep 15, 2019 at 18:57 UTC
0eb7c37a8a54557a836a225b07354b8b16c81e79
1 file changed
+6
-6
Documentation/diff-generate-patch.txt
+6
-6
@@ -53,7 +53,7 @@ similarity index value of 100% is thus reserved for two equal
53
files, while 100% dissimilarity means that no line from the old
54
file made it into the new one.
55
+
56
-The index line includes the SHA-1 checksum before and after the change.
56
+The index line includes the blob object names before and after the change.
57
The <mode> is included if the file mode does not change; otherwise,
58
separate lines indicate the old and the new mode.
59
@@ -74,7 +74,7 @@ separate lines indicate the old and the new mode.
74
rename to a
75
76
77
-combined diff format
77
+Combined diff format
78
--------------------
79
80
Any diff-generating command can take the `-c` or `--cc` option to
@@ -84,7 +84,7 @@ linkgit:git-show[1]. Note also that you can give the `-m` option to any
84
of these commands to force generation of diffs with individual parents
85
of a merge.
86
87
-A 'combined diff' format looks like this:
87
+A "combined diff" format looks like this:
88
89
------------
90
diff --combined describe.c
@@ -117,11 +117,11 @@ index fabadb8,cc95eb0..4866510
117
------------
118
119
1. It is preceded with a "git diff" header, that looks like
120
- this (when `-c` option is used):
120
+ this (when the `-c` option is used):
121
122
diff --combined file
123
+
124
-or like this (when `--cc` option is used):
124
+or like this (when the `--cc` option is used):
125
126
diff --cc file
127
@@ -164,7 +164,7 @@ parents.
164
4. Chunk header format is modified to prevent people from
165
accidentally feeding it to `patch -p1`. Combined diff format
166
was created for review of merge commit changes, and was not
167
- meant for apply. The change is similar to the change in the
167
+ meant to be applied. The change is similar to the change in the
168
extended 'index' header:
169
170
@@@ <from-file-range> <from-file-range> <to-file-range> @@@