| commit | a87469cc99408d515569ec490726eededbcfa063 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 1 Mar 2024 22:38:54 +0000 (1 14:38 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 1 Mar 2024 22:38:54 +0000 (1 14:38 -0800) | ||
| tree | 79cb03d6b4131d7993d4c9ba4c58291efe5e411d | treesnapshot (tar.gz zip) |
| parent | 0f9d4d28b7e6021b7e6db192b7bf47bd3a0d0d1d | commitdiff |
| parent | eb84c8b6cef15fcd048711afce46ce40dc5c43f5 | commitdiff |
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`
"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`
| Documentation/git-difftool.txt | diff1 | diff2 | blobhistory |