summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-03-21 14:03:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-03-21 14:03:02 -0700
commit95ef66df432ead90e432636e0d98eb491236fc83 (patch)
treeee3f4450c5954bba9d569876d123478e1ec4c36c /Documentation
parentMerge branch 'tz/credential-authinfo' (diff)
parentgit-send-email: use git credential to obtain password (diff)
downloadtgif-95ef66df432ead90e432636e0d98eb491236fc83.tar.xz
Merge branch 'mn/send-email-works-with-credential'
Hooks the credential system to send-email. * mn/send-email-works-with-credential: git-send-email: use git credential to obtain password Git.pm: add interface for git credential command Git.pm: allow pipes to be closed prior to calling command_close_bidi_pipe Git.pm: refactor command_close_bidi_pipe to use _cmd_close Git.pm: fix example in command_close_bidi_pipe documentation Git.pm: allow command_close_bidi_pipe to be called as method
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-send-email.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 44a1f7c4e8..0cffef8aa5 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -164,8 +164,8 @@ Sending
Furthermore, passwords need not be specified in configuration files
or on the command line. If a username has been specified (with
'--smtp-user' or a 'sendemail.smtpuser'), but no password has been
-specified (with '--smtp-pass' or 'sendemail.smtppass'), then the
-user is prompted for a password while the input is masked for privacy.
+specified (with '--smtp-pass' or 'sendemail.smtppass'), then
+a password is obtained using 'git-credential'.
--smtp-server=<host>::
If set, specifies the outgoing SMTP server to use (e.g.