{"thread":{"id":"20598","subject":"Re: RE : RE : trailling whitespace with git am ?","startedAt":"2009-08-14T20:48:47Z","lastAt":"2009-08-14T20:50:11Z","messageCount":2,"participants":["Alex Riesen","PICCA Frédéric-Emmanuel"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"120660","messageId":"81b0412b0908141348icee65d6kf4188cbd68405c0c@mail.gmail.com","threadId":"20598","inReplyTo":null,"subject":"Re: RE : RE : trailling whitespace with git am ?","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2009-08-14T20:48:47Z","receivedAt":"2009-08-14T20:48:47Z","isPatch":false,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"On Fri, Aug 14, 2009 at 22:46, PICCA\nFrédéric-Emmanuel<frederic-emmanuel.picca@synchrotron-soleil.fr>\nwrote:\n>> how can I do the difference between a patch with normal CR+LF (the autor use this format)\n>> and a patch without CR+LF due to the webmail ?\n>\n>> That is a question to your webmail provider but I think you generally\n>> can't.  Use dos2unix as Alex suggested and you should be fine.\n>\n> git am --whitespace=fix was sufficient to apply the patch\n>\n\nDepending on your situation it can be an overkill: it'll remove _all_ trailing\nwhite space. Not just \\r (CR).\n"},{"id":"120661","messageId":"606CC410B038E34CB97646A32D0EC0BF0181FAC1@venusbis.synchrotron-soleil.fr","threadId":"20598","inReplyTo":"81b0412b0908141348icee65d6kf4188cbd68405c0c@mail.gmail.com","subject":"RE : RE : RE : trailling whitespace with git am ?","fromName":"PICCA Frédéric-Emmanuel","fromEmail":"frederic-emmanuel.picca@synchrotron-soleil.fr","sentAt":"2009-08-14T20:50:11Z","receivedAt":"2009-08-14T20:50:11Z","isPatch":false,"sender":{"key":"frederic-emmanuel.picca@synchrotron-soleil.fr","avatar":null},"body":"> > git am --whitespace=fix was sufficient to apply the patch\n\n> Depending on your situation it can be an overkill: it'll remove _all_ trailing\n> white space. Not just \\r (CR).\n\nso /s /t and /r are the same things for git ?\n"}]}