diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-06-20 15:45:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-06-20 15:45:08 -0700 |
| commit | 8ba7dbdefbc274628b6bdc0a4cb573c2fa08b2cf (patch) | |
| tree | 6efe99411643f419d78bcdee1a62c84eb2bb070a /Documentation/diff-options.txt | |
| parent | e631115ae50dbadd891bc1ff4fdd9722f8bf8a28 (diff) | |
| parent | d7b97b7185521e3b9364b3abc6553df2480da173 (diff) | |
| download | git-8ba7dbdefbc274628b6bdc0a4cb573c2fa08b2cf.tar.xz | |
Merge branch 'rs/diff-exit-code-with-external-diff'
"git diff --exit-code --ext-diff" learned to take the exit status
of the external diff driver into account when deciding the exit
status of the overall "git diff" invocation when configured to do
so.
* rs/diff-exit-code-with-external-diff:
diff: let external diffs report that changes are uninteresting
userdiff: add and use struct external_diff
t4020: test exit code with external diffs
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index c7df20e571..cd0b81adbb 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -820,6 +820,11 @@ ifndef::git-log[] --quiet:: Disable all output of the program. Implies `--exit-code`. + Disables execution of external diff helpers whose exit code + is not trusted, i.e. their respective configuration option + `diff.trustExitCode` or `diff.<driver>.trustExitCode` or + environment variable `GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE` is + false. endif::git-log[] endif::git-format-patch[] |