Re: git-diff cr/nl files on linux

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sat, May 24, 2008 at 8:01 PM, Dirk Süsserott <newsletter@xxxxxxxxxxx> 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.cindex 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 todo with the coloring. less is at version 394.-- Duy��.n��������+%������w��{.n��������n�r������&��z�ޗ�zf���h���~����������_��+v���)ߣ�m


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux