[20:01:18]<stpeter> oh, I got an error when I followed Kev's instructions[20:01:35]<stpeter> but sure, email it to stpeter @ stpeter.im[20:01:35]<Kev> It's probably easier for Peter to apply it if you send it via email after formatting with `git format-patch`.[20:01:40]<Vanaryon> stpeter, I found strange it wasn't pulled, that's why I ping you now ;)[20:01:48]<Vanaryon> okay, will mail it[20:01:50]<stpeter> k[20:01:51]<Vanaryon> thanks ;)[20:02:05]<Kev> stpeter: To apply a mailed patch, easiest is just to view source, select all, copy, and in a terminal run `pbpaste | git am` and the patch will be ready applied.[20:03:10]<stpeter> thanks for the tip :)[20:03:36]<Vanaryon> done[20:03:45]<Kev> You can also save the email and git am /path/to/mail[20:05:24]<stpeter> save the mail, or just the attachment?[20:05:34]<stpeter> I saved the attachment and got this:

$ git am ~/Desktop/xep-0277.xml Patch format detection failed.

[20:05:54]<Kev> If the mail is sent correctly, the whole mail is what you apply.[20:05:59]<stpeter> ah ok

[20:06:38]<stpeter> :)[20:07:10]<Kev> Forward and I can look :)[20:07:36]<stpeter> ok[20:07:52]<stpeter> it is pgp-signed, so it's got to be some kind of multipart mime insanity :)[20:08:20]<Vanaryon> stpeter, do you want me to send it back without any pgp ?[20:08:39]<Kev> Vanaryon: Are you generating it correctly with git format-patch, and then sending with git send-email?[20:08:57]<Vanaryon> Kev, nope, I sent it from Evolution, my mail client[20:09:18]<Kev> Ok, so you send the format-patch output as an attachment to a mail?[20:09:19]<Vanaryon> I try with git format-patch[20:09:25]<Vanaryon> nope [20:09:55]<Kev> That will work fine too, it just means Peter has to apply the attachment instead of the whole mail.[20:10:04]<Kev> But formatting the patch is necessary whichever way.[20:10:55]<Vanaryon> Mhh I don't really understand how to proceed, git send-email does not exits[20:10:57]<Vanaryon> *-s[20:11:40]<Kev> Then just use format-patch to create the patch, and send it to Peter as an attachment.[20:11:46]<Kev> It's the format-patch bit that's the important part.[20:12:32]<stpeter> sorry, I got interrupted here IRL, brb[20:13:32]<Vanaryon> mhh, git format-patch returns me 0 bytes after stdout

[20:15:33]<Kev> Are you sure you're running it correctly?[20:16:03]<Kev> It should be dumping the patches you ask it to files and then telling you what it did on stdout.[20:16:04]<Vanaryon> the problem is that I pushed the commit this morning to my repo.[20:16:25]<Vanaryon> So there's nothing to patch, according to git[20:16:38]<Kev> So what command are you running?[20:17:50]<Vanaryon> only git format-patch, in the root of the repositery[20:18:27]<Kev> I think the manpage tells you you can't do that :p[20:18:38]<Kev> DESCRIPTION Prepare each commit with its patch in one file per commit, formatted to resemble UNIX mailbox format. The output of this command is convenient for e-mail submission or for use with git am.

There are two ways to specify which commits to operate on.

1. A single commit, <since>, specifies that the commits leading to the tip of the current branch that are not in the history that leads to the <since> to be output.

2. Generic <revision range> expression (see "SPECIFYING REVISIONS" section in gitrevisions(7)) means the commits in the specified range.[20:19:07]<Kev> So git format-patch HEAD\^will give you a file that Peter can apply for the topmost commit in your tree.[20:19:30]<Kev> git format-patch xsf/masterwill give you patches for every commit in your tree that isn't in the 'master' branch on the 'xsf' remote (if you've set one up)[20:20:42]<Vanaryon> I got it[20:26:21]<Vanaryon> okay, downloading xsf:master rep.

[20:52:04] *** Vanaryon shows as "online" and his status message is "« We cannot be sure of having something to live for unless we are willing to die for it. » E. Guevara"

[20:52:06]<Kev> You cangit rebase -i origin/master[20:52:24]<Kev> That'll let you rewrite all the history that's occured since the HEAD of origin/master (assuming you've already done a `git fetch`)[20:52:44]<Kev> So you could squash the three patches together, for example, and not have a record of the interim steps.[20:53:44]<Kev> And, indeed, modify the patches while keeping the author etc. intact if you so wish to edit the version numbers but leave the substance intact.

[20:55:12]<stpeter> ok, XEP-0277 updated and announced[20:55:57]<Vanaryon> thanks :)[20:56:34]<stpeter> no, thank you![20:56:42]<Vanaryon> We have added everything we saw from microblogging specs drafts of buddycloud and us :)[20:57:52]<Vanaryon> this may be enough for the moment ;)[20:58:15]<Vanaryon> Thanks a lot for your help stpeter and Kev, and your work ;)[20:58:41]<Vanaryon> Leave, have a good evening (or afternoon in the US? :) )