diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-10-29 13:07:39 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-10-29 13:07:39 -0700 |
commit | 2a4bcbc355496c8d83b1b9f8892c4cbe8f584158 (patch) | |
tree | 4638d4f635a65f08e49c31d27c9d27f09900e756 /git-difftool.txt | |
parent | d2c2848ee5eb75b65de6b667b52c9235903013f7 (diff) | |
download | git-htmldocs-2a4bcbc355496c8d83b1b9f8892c4cbe8f584158.tar.gz |
Autogenerated HTML docs for v2.1.3-590-g3666
Diffstat (limited to 'git-difftool.txt')
-rw-r--r-- | git-difftool.txt | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/git-difftool.txt b/git-difftool.txt index 11887e63a..333cf6ff9 100644 --- a/git-difftool.txt +++ b/git-difftool.txt @@ -91,6 +91,15 @@ instead. `--no-symlinks` is the default on Windows. the default diff tool will be read from the configured `diff.guitool` variable instead of `diff.tool`. +--[no-]trust-exit-code:: + 'git-difftool' invokes a diff tool individually on each file. + Errors reported by the diff tool are ignored by default. + Use `--trust-exit-code` to make 'git-difftool' exit when an + 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. + See linkgit:git-diff[1] for the full list of supported options. CONFIG VARIABLES @@ -116,6 +125,11 @@ See the `--tool=<tool>` option above for more details. difftool.prompt:: Prompt before each invocation of the diff tool. +difftool.trustExitCode:: + Exit difftool if the invoked diff tool returns a non-zero exit status. ++ +See the `--trust-exit-code` option above for more details. + SEE ALSO -------- linkgit:git-diff[1]:: |