diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-29 17:09:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-29 17:09:35 (GMT) |
| commit | 9ce57f12280eb6a95043e28ad68ff2b6c70c09ad (patch) | |
| tree | 5e4a7d25dffc8a7fc193cc7e473103f86ebcae86 /Documentation | |
| parent | e82935d9177f93a4777e8a3ee5e9d131fb884613 (diff) | |
| parent | 2b52123fcf840686b69e10807fd0f985ec4167f3 (diff) | |
| download | git-9ce57f12280eb6a95043e28ad68ff2b6c70c09ad.zip git-9ce57f12280eb6a95043e28ad68ff2b6c70c09ad.tar.gz git-9ce57f12280eb6a95043e28ad68ff2b6c70c09ad.tar.bz2 | |
Merge branch 'da/difftool'
Allow diff tool backend to stop early by exiting with a non-zero
status.
* da/difftool:
difftool: add support for --trust-exit-code
difftool--helper: exit when reading a prompt answer fails
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-difftool.txt | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 11887e6..333cf6f 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/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]:: |