{"thread":{"id":"13414","subject":"starting off","startedAt":"2008-05-07T12:17:33Z","lastAt":"2008-05-07T13:24:02Z","messageCount":3,"participants":["Matt Davies","Santi Béjar","matt davies"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"76272","messageId":"loom.20080507T121321-885@post.gmane.org","threadId":"13414","inReplyTo":null,"subject":"starting off","fromName":"Matt Davies","fromEmail":"mjdavies@glam.ac.uk","sentAt":"2008-05-07T12:17:33Z","receivedAt":"2008-05-07T12:17:33Z","isPatch":false,"sender":{"key":"mjdavies@glam.ac.uk","avatar":null},"body":"Hello everyone\n\nI'm as new as new can be so please be gentle.\n\ngit version 1.5.4.5\n\nI'm following the peepcode tutorial peepcode-015-git.mov\n\nI've created a branch, and now we're trying to use \n\nrebase to 'watch' the master branch from the new branch.\n\nWhen I run the rebase command from the other branch \n\nI get these types of warnings/errors\n\nhttp://pastie.caboo.se/192951\n\nCan someone explain to me what's happening here and if I \n\nshould be worried about it?\n\nIf I should be worried about it\n\ncan anyone point me in the direction of some \n\ndocumentation of a good (easy)way\n\nto remove the whitespace?\n\nThanks everyone.\n\nPS, I do check the archives and found this from yesterday\n\nhttp://thread.gmane.org/gmane.comp.version-control.git/76650/focus=81336\n\nDoes that mean that if I update my git this problem will be resolved?\n\nSorry for being so naive, I wont be for long (hopefully)\n"},{"id":"76276","messageId":"8aa486160805070600v5d7b3d2eqce5ee893d0016148@mail.gmail.com","threadId":"13414","inReplyTo":"loom.20080507T121321-885@post.gmane.org","subject":"Re: starting off","fromName":"Santi Béjar","fromEmail":"sbejar@gmail.com","sentAt":"2008-05-07T13:00:26Z","receivedAt":"2008-05-07T13:00:26Z","isPatch":false,"sender":{"key":"santi@agolina.net","avatar":null},"body":"On Wed, May 7, 2008 at 2:17 PM, Matt Davies wrote:\n> Hello everyone\n>\n> I'm as new as new can be so please be gentle.\n>\n> git version 1.5.4.5\n\nCan you remove the double spacing?\n\n>\n> I'm following the peepcode tutorial peepcode-015-git.mov\n>\n> I've created a branch, and now we're trying to use\n>\n> rebase to 'watch' the master branch from the new branch.\n>\n> When I run the rebase command from the other branch\n>\n> I get these types of warnings/errors\n>\n> http://pastie.caboo.se/192951\n\nWhy a link? Paste this inside the mail, this way the mail is self\nconsistent, the others do not have to go to this site and can quote\nit.\n\n>\n> Can someone explain to me what's happening here and if I\n>\n> should be worried about it?\n\nSome of the patches introduced lines with trailing whitespaces, git\napply warns about it. You can remove the warnings setting the config\n\"apply.whitespace\" to nowarn, or you can remove them or get used to.\n\nThe final result was OK? what you expected? Did it keept the trailing\nwhitespaces?\n\nYou can try rebase with different\n--whitespaces=\n\n>\n> If I should be worried about it\n>\n> can anyone point me in the direction of some\n>\n> documentation of a good (easy)way\n>\n> to remove the whitespace?\n>\n\ngit rebase --whitespace=fix\n\nAt least 1.5.5\n\n> Thanks everyone.\n>\n> PS, I do check the archives and found this from yesterday\n>\n> http://thread.gmane.org/gmane.comp.version-control.git/76650/focus=81336\n\nIt's a long mail...\n\nSanti\n"},{"id":"76282","messageId":"C7099BC4-3459-4EC7-8AF0-B6A76B096535@glam.ac.uk","threadId":"13414","inReplyTo":"8aa486160805070600v5d7b3d2eqce5ee893d0016148@mail.gmail.com","subject":"Re: starting off","fromName":"matt davies","fromEmail":"mjdavies@glam.ac.uk","sentAt":"2008-05-07T13:24:02Z","receivedAt":"2008-05-07T13:24:02Z","isPatch":false,"sender":{"key":"mjdavies@glam.ac.uk","avatar":null},"body":"Hi Santi, thanks for getting back to me.\n\n> Can you remove the double spacing?\n\n\nI've accidentally posted twice, the first post was me emailing my \nquestion in. That took so long to appear that I then reposted using \nthis site.\nhttp://permalink.gmane.org/gmane.comp.version-control.git/81433\n\nPosting on that site only allows lines with 80 characters in, so I had \nto press enter at the end of every line so that it would post.\n\n>> Why a link? Paste this inside the mail, this way the mail is self\n>> consistent, the others do not have to go to this site and can quote\n>> it.\n\nSame reason as above.\n\n> git rebase --whitespace=fix\n\nI'm going to update my git and give that a go, also, I'll only send \nemails into the list from now on.\n\n\nOn 7 May 2008, at 14:00, Santi Béjar wrote:\n\n> On Wed, May 7, 2008 at 2:17 PM, Matt Davies \n> wrote:\n>> Hello everyone\n>>\n>> I'm as new as new can be so please be gentle.\n>>\n>> git version 1.5.4.5\n>\n> Can you remove the double spacing?\n>\n>>\n>> I'm following the peepcode tutorial peepcode-015-git.mov\n>>\n>> I've created a branch, and now we're trying to use\n>>\n>> rebase to 'watch' the master branch from the new branch.\n>>\n>> When I run the rebase command from the other branch\n>>\n>> I get these types of warnings/errors\n>>\n>> http://pastie.caboo.se/192951\n>\n> Why a link? Paste this inside the mail, this way the mail is self\n> consistent, the others do not have to go to this site and can quote\n> it.\n>\n>>\n>> Can someone explain to me what's happening here and if I\n>>\n>> should be worried about it?\n>\n> Some of the patches introduced lines with trailing whitespaces, git\n> apply warns about it. You can remove the warnings setting the config\n> \"apply.whitespace\" to nowarn, or you can remove them or get used to.\n>\n> The final result was OK? what you expected? Did it keept the trailing\n> whitespaces?\n>\n> You can try rebase with different\n> --whitespaces=\n>\n>>\n>> If I should be worried about it\n>>\n>> can anyone point me in the direction of some\n>>\n>> documentation of a good (easy)way\n>>\n>> to remove the whitespace?\n>>\n>\n> git rebase --whitespace=fix\n>\n> At least 1.5.5\n>\n>> Thanks everyone.\n>>\n>> PS, I do check the archives and found this from yesterday\n>>\n>> http://thread.gmane.org/gmane.comp.version-control.git/76650/focus=81336\n>\n> It's a long mail...\n>\n> Santi\n"}]}