summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-29 18:06:42 -0700
committerJunio C Hamano <gitster@pobox.com>2016-05-29 18:06:42 -0700
commit3a79d4251b65548a446dfd88fcfa43234e9c5f66 (patch)
tree85172dab1c33699757aa4bf52b9c358cda89c55c
parent07ffe8716f8be04d838915402b482c5ee03227d4 (diff)
parent66409881238702fa6351e655f6aec8675c4b346f (diff)
downloadgit-3a79d4251b65548a446dfd88fcfa43234e9c5f66.tar.gz
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
-rw-r--r--Documentation/git-send-email.txt13
1 files changed, 13 insertions, 0 deletions
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: