aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-difftool.txt
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2016-06-28 13:40:11 +0200
committerJunio C Hamano <gitster@pobox.com>2016-06-28 08:36:45 -0700
commitbcf9626a71a0d90be65acc265ad0ec488d95d6ed (patch)
tree9612c442f9437ba58b7b7baa46ba73282ff790a6 /Documentation/git-difftool.txt
parent23f8239bbe0a893bd8754a03e9d4fda62804ac14 (diff)
downloadgit-bcf9626a71a0d90be65acc265ad0ec488d95d6ed.tar.gz
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/git-difftool.txt')
-rw-r--r--Documentation/git-difftool.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 333cf6ff91..224fb3090b 100644
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -98,7 +98,7 @@ instead. `--no-symlinks` is the default on Windows.
invoked diff tool returns a non-zero exit code.
+
'git-difftool' will forward the exit code of the invoked tool when
-'--trust-exit-code' is used.
+`--trust-exit-code` is used.
See linkgit:git-diff[1] for the full list of supported options.