{"thread":{"id":"20597","subject":"Re: RE : trailling whitespace with git am ?","startedAt":"2009-08-14T20:31:01Z","lastAt":"2009-08-14T20:31:01Z","messageCount":1,"participants":["Alex Riesen"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"120655","messageId":"81b0412b0908141331q1783306fwbcf91769379ca517@mail.gmail.com","threadId":"20597","inReplyTo":null,"subject":"Re: RE : trailling whitespace with git am ?","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2009-08-14T20:31:01Z","receivedAt":"2009-08-14T20:31:01Z","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:21, PICCA\nFrédéric-Emmanuel<frederic-emmanuel.picca@synchrotron-soleil.fr>\nwrote:\n>> This patch has DOS line endings (like CR, followed by LF).\n>\n>> You can either use dos2unix (or your editor of choice), or update your git\n>> to current master branch, where \"git am\" handles such patches transparently.\n>\n> I am using git 1.6.3.3 debian unstable is it ok ?\n\nNo. I just checked - it is not even in master yet. You can merge\nthe commits at c2ca1d79dbd54b06. That's what I am using. These\nare merged in Junio's next already, so you'll see them in master\nsomeday. Meanwhile I can have it like this:\n\n$ git clone git://git.kernel.org/pub/scm/git/git.git\n$ cd git\n$ git merge c2ca1d79dbd54b06\n$ make && make test && make doc\n$ make install install-doc\n\nThis will install the freshly compiled git in your home (~/bin,\n~/share, ~/libexec, ...)\n\nI would recommend to remove the debian's git first, BTW.\n\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\nJust replace the trailing CR+LF with just LF. The program named\n\"dos2unix\" does that.\n"}]}