Thread (5 messages) flat view 5 messages, 2 authors, 2026-05-09

Re: [BUG] "git diff --word-diff" gives a diff while they are only space changes

From: Vincent Lefevre <hidden>
Date: 2026-05-08 21:39:51
Subsystem: the rest · Maintainer: Linus Torvalds

On 2026-05-08 14:48:01 +0200, Johannes Sixt wrote:
This is expected behavior.

git diff --word-diff is not agnostic to whitespace; if you drop
--word-diff, you see the line-diff that the word-diff is based on. If
you want whitespace-agnostic word-diff, you have to add -w.
This is not how it is documented. Even when using "git diff" without
--word-diff, but with GNU wdiff instead, the output is fine:

$ git diff file1 file2 | wdiff -d
diff --git a/file1 b/file2
index da04344..0074613 100644
[--- a/file1-]
{+++ b/file2+}
@@ -1,5 +1,5 @@
1
 2
 3
 2
 4

-- 
Vincent Lefèvre [off-list ref] - Web: <https://www.vinc17.net/>
100% accessible validated (X)HTML - Blog: <https://www.vinc17.net/blog/>
Work: CR INRIA - computer arithmetic / Pascaline project (LIP, ENS-Lyon)
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help