From: Nguyen Thai Ngoc Duy Date: Mon, 26 May 2008 04:15:10 GMT Subject: Re: git-diff cr/nl files on linux Message-ID: In-Reply-To: <483811BF.3090302@dirk.my1.cc> On Sat, May 24, 2008 at 8:01 PM, Dirk Süsserott wrote: > Nguyen Thai Ngoc Duy schrieb: >> >> Hi, >> >> Is there any way that can make git-diff show cr/nl ending files on >> linux without ^M at the end? >> >> Thanks >> > > 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. Here is a snippet of what I see: diff --git a/abc.c b/abc.c index 064a769..647b9ae 100644 --- a/abc.c +++ b/abc.c @@ -859,7 +859,10 @@ int def ) { FAST int asdsa; - FAST int dsdsad; + FAST int dsadadd; /* ERROR also means AASAS */^M +#ifndef JHASHJJH^M + struct sdddd dasdada;^M +#endif^M union sddd asdsdad; FAST STATUS dsadadad; unsigned int sdadadad = 0; With color turning off, it does not show ^M so probably something to do with the coloring. less is at version 394. -- Duy