From: Junio C Hamano Date: Mon, 26 May 2008 04:37:10 GMT Subject: Re: git-diff cr/nl files on linux Message-ID: <7vskw5el55.fsf@gitster.siamese.dyndns.org> In-Reply-To: "Nguyen Thai Ngoc Duy" writes: > On Sat, May 24, 2008 at 8:01 PM, Dirk Süsserott wrote: > ... >> What about 'git diff -w'? It drops any whitespace changes, including ^M's. >> Not sure whether that is what you meant. > > That won't help. Just like GNU diff, the only thing -w (and -b) does is to omit hunks whose changes consist of _only whitespace changes_ and nothing else. In your quoted example, you have changes other than whitespace changes, so it is unsurprising that you will see the whole change, together with your whitespace changes.