Re: [PATCH] mergetool merge/skip/abort

[Caleb Cushing <xenoterracide@gmail.com>]

>   1. You copy-and-pasted output from format-patch, and have the header
>     part in the message body. Charles and Johannes have moved them to the
>     Email header.
>
>     Their messages are in the form the tool used for patch acceptance
>     expects. Yours isn't, and forces Junio to manually edit your message
>     before handling it.

I'll get to the rest later...

but I tried sending the patch via email as you said followed this...
verbatim except replacing user@ and p4ssw0rd with my credentials, and
I got an auth error back. currently I've no idea how I would send
stuff from gmail. and I reject inline patches in funtoo because I use
webmail and they are impossible for me to handle easily.

Submitting properly formatted patches via Gmail is simple now that
IMAP support is available. First, edit your ~/.gitconfig to specify your
account settings:

[imap]
    folder = "[Gmail]/Drafts"
    host = imaps://imap.gmail.com
    user = user@gmail.com
    pass = p4ssw0rd
    port = 993
    sslverify = false

Next, ensure that your Gmail settings are correct. In "Settings" the
"Use Unicode (UTF-8) encoding for outgoing messages" should be checked.

Once your commits are ready to send to the mailing list, run the following
command to send the patch emails to your Gmail Drafts folder.

    $ git format-patch -M --stdout origin/master | git imap-send



-- 
Caleb Cushing

http://xenoterracide.blogspot.com