summaryrefslogtreecommitdiff
path: root/Documentation/diff-format.txt
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2016-06-28 11:40:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-06-28 15:36:45 (GMT)
commitbcf9626a71a0d90be65acc265ad0ec488d95d6ed (patch)
tree9612c442f9437ba58b7b7baa46ba73282ff790a6 /Documentation/diff-format.txt
parent23f8239bbe0a893bd8754a03e9d4fda62804ac14 (diff)
downloadgit-bcf9626a71a0d90be65acc265ad0ec488d95d6ed.zip
git-bcf9626a71a0d90be65acc265ad0ec488d95d6ed.tar.gz
git-bcf9626a71a0d90be65acc265ad0ec488d95d6ed.tar.bz2
doc: typeset long command-line options as literal
Similarly to the previous commit, use backquotes instead of forward-quotes, for long options. This was obtained with: perl -pi -e "s/'(--[a-z][a-z=<>-]*)'/\`\$1\`/g" *.txt and manual tweak to remove false positive in ascii-art (o'--o'--o' to describe rewritten history). 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.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index f10fd54..cf52626 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -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: