summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-09-29 16:44:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-09-29 16:44:44 -0700
commit2a858ee95134926a0ccccb9a78db06bcb0bd65d0 (patch)
treeed54810cdce5391a734dec04750a31d89a2c2017 /Documentation
parentMerge branch 'ss/svnimport' (diff)
parentsend-email --smtp-server-port: allow overriding the default port (diff)
downloadtgif-2a858ee95134926a0ccccb9a78db06bcb0bd65d0.tar.xz
Merge branch 'gr/smtp'
* gr/smtp: send-email --smtp-server-port: allow overriding the default port
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-send-email.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 1ec61affab..3727776a0b 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -91,6 +91,11 @@ The --cc option must be repeated for each user you want on the cc list.
`/usr/lib/sendmail` if such program is available, or
`localhost` otherwise.
+--smtp-server-port::
+ Specifies a port different from the default port (SMTP
+ servers typically listen to smtp port 25 and ssmtp port
+ 465).
+
--smtp-user, --smtp-pass::
Username and password for SMTP-AUTH. Defaults are the values of
the configuration values 'sendemail.smtpuser' and