diff options
| author |  Matthieu Moy <Matthieu.Moy@imag.fr> | 2016-06-28 13:40:11 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-06-28 08:36:45 -0700 |
| commit | bcf9626a71a0d90be65acc265ad0ec488d95d6ed (patch) | |
| tree | 9612c442f9437ba58b7b7baa46ba73282ff790a6 /Documentation/git-difftool.txt | |
| parent | doc: typeset short command-line options as literal (diff) | |
| download | tgif-bcf9626a71a0d90be65acc265ad0ec488d95d6ed.tar.xz | |
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.txt | 2 |
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. |