diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-10-26 21:37:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-26 21:37:54 -0700 |
| commit | a7b60f00557002a37b1ea2e1922ac6ffbfc61fef (patch) | |
| tree | b7438e5a17e1ba900cd1d9d5d1f0ff7e82d00444 /Documentation | |
| parent | acbaf54f3030854b54f8391f7d1ca11935a75518 (diff) | |
| parent | 052fbea26e51121d155ccaa3b0ae6ac892cc41ea (diff) | |
| download | git-a7b60f00557002a37b1ea2e1922ac6ffbfc61fef.tar.gz | |
Merge branch 'po/sendemail'
* po/sendemail:
New send-email option smtpserveroption.
Remove @smtp_host_parts variable as not used.
Minor indentation fix.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 1 | ||||
| -rw-r--r-- | Documentation/git-send-email.txt | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index ba9639c7bd..538ebb5e2e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1737,6 +1737,7 @@ sendemail.to:: sendemail.smtpdomain:: sendemail.smtpserver:: sendemail.smtpserverport:: +sendemail.smtpserveroption:: sendemail.smtpuser:: sendemail.thread:: sendemail.validate:: diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index c283084272..cde404a461 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -165,6 +165,15 @@ user is prompted for a password while the input is masked for privacy. are also accepted. The port can also be set with the 'sendemail.smtpserverport' configuration variable. +--smtp-server-option=<option>:: + If set, specifies the outgoing SMTP server option to use. + Default value can be specified by the 'sendemail.smtpserveroption' + configuration option. ++ +The --smtp-server-option option must be repeated for each option you want +to pass to the server. Likewise, different lines in the configuration files +must be used for each option. + --smtp-ssl:: Legacy alias for '--smtp-encryption ssl'. |