Skip to content

Commit 0eb7c37

Browse files
j6tgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 6fae6bd commit 0eb7c37

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Documentation/diff-generate-patch.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ similarity index value of 100% is thus reserved for two equal
5353
files, while 100% dissimilarity means that no line from the old
5454
file made it into the new one.
5555
+
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.
5757
The <mode> is included if the file mode does not change; otherwise,
5858
separate lines indicate the old and the new mode.
5959

@@ -74,7 +74,7 @@ separate lines indicate the old and the new mode.
7474
rename to a
7575

7676

77-
combined diff format
77+
Combined diff format
7878
--------------------
7979

8080
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
8484
of these commands to force generation of diffs with individual parents
8585
of a merge.
8686

87-
A 'combined diff' format looks like this:
87+
A "combined diff" format looks like this:
8888

8989
------------
9090
diff --combined describe.c
@@ -117,11 +117,11 @@ index fabadb8,cc95eb0..4866510
117117
------------
118118

119119
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):
121121

122122
diff --combined file
123123
+
124-
or like this (when `--cc` option is used):
124+
or like this (when the `--cc` option is used):
125125

126126
diff --cc file
127127

@@ -164,7 +164,7 @@ parents.
164164
4. Chunk header format is modified to prevent people from
165165
accidentally feeding it to `patch -p1`. Combined diff format
166166
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
168168
extended 'index' header:
169169

170170
@@@ <from-file-range> <from-file-range> <to-file-range> @@@

0 commit comments

Comments
 (0)