On Fri, Aug 14, 2009 at 22:46, PICCA Frédéric-Emmanuel<frederic-emmanuel.picca@xxxxxxxxxxxxxxxxxxxxx> 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). -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html