From: Alex Riesen Date: Fri, 14 Aug 2009 20:48:47 GMT Subject: Re: RE : RE : trailling whitespace with git am ? Message-ID: <81b0412b0908141348icee65d6kf4188cbd68405c0c@mail.gmail.com> On Fri, Aug 14, 2009 at 22:46, PICCA Frédéric-Emmanuel wrote: >> how can I do the difference between a patch with normal CR+LF (the autor use this format) >> and a patch without CR+LF due to the webmail ? > >> That is a question to your webmail provider but I think you generally >> can't.  Use dos2unix as Alex suggested and you should be fine. > > git am --whitespace=fix was sufficient to apply the patch > Depending on your situation it can be an overkill: it'll remove _all_ trailing white space. Not just \r (CR).