diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-03-01 14:38:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-01 14:38:54 -0800 |
| commit | a87469cc99408d515569ec490726eededbcfa063 (patch) | |
| tree | 79cb03d6b4131d7993d4c9ba4c58291efe5e411d /Documentation/git-difftool.txt | |
| parent | 0f9d4d28b7e6021b7e6db192b7bf47bd3a0d0d1d (diff) | |
| parent | eb84c8b6cef15fcd048711afce46ce40dc5c43f5 (diff) | |
| download | git-a87469cc99408d515569ec490726eededbcfa063.tar.gz | |
Merge branch 'ps/difftool-dir-diff-exit-code' into HEAD
"git difftool --dir-diff" learned to honor the "--trust-exit-code"
option; it used to always exit with 0 and signalled success.
* ps/difftool-dir-diff-exit-code:
git-difftool--helper: honor `--trust-exit-code` with `--dir-diff`
Diffstat (limited to 'Documentation/git-difftool.txt')
| -rw-r--r-- | Documentation/git-difftool.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index c05f97aca9..a616f8b2e6 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.txt @@ -105,7 +105,6 @@ instead. `--no-symlinks` is the default on Windows. `merge.tool` until a tool is found. --[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. |