Merge branch 'js/t6026-clean-up' into maint

diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt
index 18608f58509df4ae6a0349cfd9c3a398bd335839..d2a7ff56e860b92c4dd346a0ea1eb2eb9f7fde79 100644 (file)
--- a/Documentation/diff-generate-patch.txt
+++ b/Documentation/diff-generate-patch.txt
@@ -2,7 +2,7 @@ Generating patches with -p
 --------------------------
 
 When "git-diff-index", "git-diff-tree", or "git-diff-files" are run
-with a `-p` option, "git diff" without the '--raw' option, or
+with a `-p` option, "git diff" without the `--raw` option, or
 "git log" with the "-p" option, they
 do not produce the output described above; instead they produce a
 patch file.  You can customize the creation of such patches via the
@@ -118,7 +118,7 @@ index fabadb8,cc95eb0..4866510
 
        diff --combined file
 +
-or like this (when '--cc' option is used):
+or like this (when `--cc` option is used):
 
        diff --cc file