diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-08-30 13:50:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-08-30 13:50:41 -0700 |
| commit | 74a2e88700efc2f1874967e7f007723d0865ac1b (patch) | |
| tree | 15c9d7fe1ef18dd33d0f0a48a3767c8a3b23d8b9 /builtin/merge.c | |
| parent | 5ba560ba760a945239c9f526307e6402f7032299 (diff) | |
| parent | a64f8b25953b9cf0f6d81ed24e87448ae513b094 (diff) | |
Merge branch 'jc/diff-exit-code-with-w-fixes'
"git diff -w --exit-code" with various options did not work
correctly, which is being addressed.
* jc/diff-exit-code-with-w-fixes:
diff: the -w option breaks --exit-code for --raw and other output modes
t4040: remove test that succeeded for a wrong reason
diff: teach "--stat -w --exit-code" to notice differences
diff: mode-only change should be noticed by "--patch -w --exit-code"
diff: move the fallback "--exit-code" code down
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions