{"thread":{"id":"21041","subject":"'git am' doubt","startedAt":"2009-09-23T22:20:53Z","lastAt":"2009-09-24T14:09:21Z","messageCount":3,"participants":["Thiago Farina","David Aguilar"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"123702","messageId":"a4c8a6d00909231520s53be6654ibf74d4430e7e82f@mail.gmail.com","threadId":"21041","inReplyTo":null,"subject":"'git am' doubt","fromName":"Thiago Farina","fromEmail":"tfransosi@gmail.com","sentAt":"2009-09-23T22:20:53Z","receivedAt":"2009-09-23T22:20:53Z","isPatch":false,"sender":{"key":"tfransosi@gmail.com","avatar":"https://avatars.githubusercontent.com/u/970071?v=4"},"body":"Hi,\n\nI'm trying to apply a patch from the mailing list using 'git am'.\n\nWhat I'm doing is:\n\n- In gmail:\n - Save original, then I copied the content to a text editor.\n- In text editor:\n - Remove the first empty line.\n - Save the file in the same directory where I have the git source.\n- In git directory:\n - $ git am -s ./filename.mbox\n\nOf course I'm doing something wrong here, but I don't know what.\nThe error is:\ncat: /home/tfarina/git/.git/rebase-apply/next: No such file or directory\nprevious rebase directory /home/tfarina/git/.git/rebase-apply still\nexists but mbox given.\n\nSorry if this is already answered before in this mailing list, but I\ncouldn't find it.\n\nThanks anyway for the time and help.\n"},{"id":"123705","messageId":"20090923235433.GB80337@gmail.com","threadId":"21041","inReplyTo":"a4c8a6d00909231520s53be6654ibf74d4430e7e82f@mail.gmail.com","subject":"Re: 'git am' doubt","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2009-09-23T23:54:33Z","receivedAt":"2009-09-23T23:54:33Z","isPatch":false,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"On Wed, Sep 23, 2009 at 07:20:53PM -0300, Thiago Farina wrote:\n> Hi,\n> \n> I'm trying to apply a patch from the mailing list using 'git am'.\n> \n> What I'm doing is:\n> \n> - In gmail:\n>  - Save original, then I copied the content to a text editor.\n> - In text editor:\n>  - Remove the first empty line.\n>  - Save the file in the same directory where I have the git source.\n> - In git directory:\n>  - $ git am -s ./filename.mbox\n> \n> Of course I'm doing something wrong here, but I don't know what.\n> The error is:\n> cat: /home/tfarina/git/.git/rebase-apply/next: No such file or directory\n> previous rebase directory /home/tfarina/git/.git/rebase-apply still\n> exists but mbox given.\n\n\nPerhaps you tried this previously and 'git am' failed?\nIn which case, run 'git am --abort'.\n\n\nNow.. I've _never_ had luck saving patches out of gmail.\nBut, I've had good luck with its imap interface.\nI use mutt, save emails to an mbox file, and use 'git am'\non them.  This has worked great for me.\n\nFor sending emails to the list, I use msmtp and a\n~/.gitconfig setting:\n\n\n[sendemail]\n        smtpserver = /usr/bin/msmtp\n\n\nThen it's simply 'git send-email <patch-file>'.\n\n\nHere's a random page explaining how to use mutt with gmail.\nhttp://shreevatsa.wordpress.com/2007/07/31/using-gmail-with-mutt-the-minimal-way/\n\nI can send you my .muttrc if that helps.\n\nHere's the git wiki page about msmtp, gmail, and\ngit-send-email:\n\nhttp://git-scm.org/gitwiki/GitTips#Usingmsmtptosendyourpatches\n\n-- \n\n\tDavid\n"},{"id":"123733","messageId":"a4c8a6d00909240709r27aff2abwbf5eaa31fe95855b@mail.gmail.com","threadId":"21041","inReplyTo":"20090923235433.GB80337@gmail.com","subject":"Re: 'git am' doubt","fromName":"Thiago Farina","fromEmail":"tfransosi@gmail.com","sentAt":"2009-09-24T14:09:21Z","receivedAt":"2009-09-24T14:09:21Z","isPatch":false,"sender":{"key":"tfransosi@gmail.com","avatar":"https://avatars.githubusercontent.com/u/970071?v=4"},"body":"On Wed, Sep 23, 2009 at 8:54 PM, David Aguilar <davvid@gmail.com> wrote:\n> On Wed, Sep 23, 2009 at 07:20:53PM -0300, Thiago Farina wrote:\n>> Hi,\n>>\n>> I'm trying to apply a patch from the mailing list using 'git am'.\n>>\n>> What I'm doing is:\n>>\n>> - In gmail:\n>>  - Save original, then I copied the content to a text editor.\n>> - In text editor:\n>>  - Remove the first empty line.\n>>  - Save the file in the same directory where I have the git source.\n>> - In git directory:\n>>  - $ git am -s ./filename.mbox\n>>\n>> Of course I'm doing something wrong here, but I don't know what.\n>> The error is:\n>> cat: /home/tfarina/git/.git/rebase-apply/next: No such file or directory\n>> previous rebase directory /home/tfarina/git/.git/rebase-apply still\n>> exists but mbox given.\n>\n>\n> Perhaps you tried this previously and 'git am' failed?\n> In which case, run 'git am --abort'.\nI didn't try before.\n>\n>\n> Now.. I've _never_ had luck saving patches out of gmail.\n> But, I've had good luck with its imap interface.\n> I use mutt, save emails to an mbox file, and use 'git am'\n> on them.  This has worked great for me.\nYeah, I tried with Evolution, and it worked for me, so the problem was\nwith Gmail.\n>\n> For sending emails to the list, I use msmtp and a\n> ~/.gitconfig setting:\n>\n>\n> [sendemail]\n>        smtpserver = /usr/bin/msmtp\n>\n>\n> Then it's simply 'git send-email <patch-file>'.\n>\n>\n> Here's a random page explaining how to use mutt with gmail.\n> http://shreevatsa.wordpress.com/2007/07/31/using-gmail-with-mutt-the-minimal-way/\n>\n> I can send you my .muttrc if that helps.\nI'm using send-email to send my patches too. If you could, send me\nyour .muttrc, I will appreciate, may be I can try to use it instead of\nEvolution.\n\nThanks for your help. ;)\n"}]}