summaryrefslogtreecommitdiff
path: root/Documentation/diff-format.txt
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2016-06-28 11:40:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-06-28 15:20:52 (GMT)
commit23f8239bbe0a893bd8754a03e9d4fda62804ac14 (patch)
tree0947594a08ce642309a2a9c3a85b24b7cbe24489 /Documentation/diff-format.txt
parent46e22b70dfe541f4ca1c04a53aba17df377b70f9 (diff)
downloadgit-23f8239bbe0a893bd8754a03e9d4fda62804ac14.zip
git-23f8239bbe0a893bd8754a03e9d4fda62804ac14.tar.gz
git-23f8239bbe0a893bd8754a03e9d4fda62804ac14.tar.bz2
doc: typeset short command-line options as literal
It was common in our documentation to surround short option names with forward quotes, which renders as italic in HTML. Instead, use backquotes which renders as monospace. This is one more step toward conformance to Documentation/CodingGuidelines. This was obtained with: perl -pi -e "s/'(-[a-z])'/\`\$1\`/g" *.txt Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-format.txt')
-rw-r--r--Documentation/diff-format.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index 85b0890..f10fd54 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -46,11 +46,11 @@ That is, from the left to the right:
. sha1 for "dst"; 0\{40\} if creation, unmerged or "look at work tree".
. a space.
. status, followed by optional "score" number.
-. a tab or a NUL when '-z' option is used.
+. a tab or a NUL when `-z` option is used.
. path for "src"
-. a tab or a NUL when '-z' option is used; only exists for C or R.
+. a tab or a NUL when `-z` option is used; only exists for C or R.
. path for "dst"; only exists for C or R.
-. an LF or a NUL when '-z' option is used, to terminate the record.
+. an LF or a NUL when `-z` option is used, to terminate the record.
Possible status letters are:
@@ -86,7 +86,7 @@ diff format for merges
----------------------
"git-diff-tree", "git-diff-files" and "git-diff --raw"
-can take '-c' or '--cc' option
+can take `-c` or '--cc' option
to generate diff output also for merge commits. The output differs
from the format described above in the following way: