SubmittingPatches: update GMail section
Even if you use imap-send to throw your drafts in the outbox, using their web interface will mangle your patches. Clarify that the imap-send is meant to be used together with a real MUA that can use IMAP drafts, and remove instructions related to the web interface, which is irrelevant. Add description of send-email as an alternative. Use --cover-letter, and do not use -C nor --no-color, on the example command line for format-patch. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 7, 2010 at 15:59 UTC
df5753c4f6398c1b0a9f5bd4b24d7bf47a33533f
1 file changed
+24
-11
Documentation/SubmittingPatches
+24
-11
@@ -520,11 +520,9 @@ Gmail
520
GMail does not appear to have any way to turn off line wrapping in the web
521
interface, so this will mangle any emails that you send. You can however
522
use any IMAP email client to connect to the google imap server, and forward
523
-the emails through that. Just make sure to disable line wrapping in that
524
-email client. Alternatively, use "git send-email" instead.
523
+the emails through that.
524
526
-Submitting properly formatted patches via Gmail is simple now that
527
-IMAP support is available. First, edit your ~/.gitconfig to specify your
525
+To submit using the IMAP interface, first, edit your ~/.gitconfig to specify your
526
account settings:
527
528
[imap]
@@ -538,14 +536,29 @@ account settings:
536
You might need to instead use: folder = "[Google Mail]/Drafts" if you get an error
537
that the "Folder doesn't exist".
538
541
-Next, ensure that your Gmail settings are correct. In "Settings" the
542
-"Use Unicode (UTF-8) encoding for outgoing messages" should be checked.
539
+Once your commits are ready to be sent to the mailing list, run the
540
+following command to send the patch emails to your Gmail Drafts
541
+folder.
542
544
-Once your commits are ready to send to the mailing list, run the following
545
-command to send the patch emails to your Gmail Drafts folder.
543
+ $ git format-patch --cover-letter -M --stdout origin/master | git imap-send
544
547
- $ git format-patch -M --stdout origin/master | git imap-send
545
+Just make sure to disable line wrapping in the email client (GMail web
546
+interface will line wrap no matter what, so you need to use a real
547
+IMAP client).
548
549
-Go to your Gmail account, open the Drafts folder, find the patch email, fill
550
-in the To: and CC: fields and send away!
549
+Alternatively, you can use "git send-email" and send your patches
550
+through the GMail SMTP server. edit ~/.gitconfig to specify your
551
+account settings:
552
+
553
+[sendemail]
554
+ smtpencryption = tls
555
+ smtpserver = smtp.gmail.com
556
+ smtpuser = user@gmail.com
557
+ smtppass = p4ssw0rd
558
+ smtpserverport = 587
559
+
560
+Once your commits are ready to be sent to the mailing list, run the
561
+following commands:
562
563
+ $ git format-patch --cover-letter -M origin/master -o outgoing/
564
+ $ git send-email outgoing/*