From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 May 2016 01:06:42 +0000 (-0700)
Subject: Merge branch 'mr/send-email-doc-gmail-2fa'
X-Git-Tag: v2.9.0-rc1~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3a79d4251b65548a446dfd88fcfa43234e9c5f66?hp=07ffe8716f8be04d838915402b482c5ee03227d4

Merge branch 'mr/send-email-doc-gmail-2fa'

Give hints to GMail users with two-factor auth enabled that
they need app-specific-password when using send-email.

* mr/send-email-doc-gmail-2fa:
Documentation: add instructions to help setup gmail 2FA
---

diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 771a7b5b09..edbba3a2ef 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -450,6 +450,19 @@ edit ~/.gitconfig to specify your account settings:
 		smtpUser = yourname@gmail.com
 		smtpServerPort = 587
 
+If you have multifactor authentication setup on your gmail acocunt, you will
+need to generate an app-specific password for use with 'git send-email'. Visit
+https://security.google.com/settings/security/apppasswords to setup an
+app-specific password.  Once setup, you can store it with the credentials
+helper:
+
+	$ git credential fill
+	protocol=smtp
+	host=smtp.gmail.com
+	username=youname@gmail.com
+	password=app-password
+
+
 Once your commits are ready to be sent to the mailing list, run the
 following commands: