summaryrefslogtreecommitdiffstats
path: root/git-send-email.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-07-02 03:06:38 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-07-02 03:06:38 +0000
commitfce7c7e1549d1a2a2b0faf5952378236eed4d468 (patch)
treeffce2ae419b52786a0e567f4fddaadd89016f62c /git-send-email.html
parentbb8e996adf4293a0b624fe77e95e12ae8d1faed9 (diff)
downloadgit-htmldocs-fce7c7e1549d1a2a2b0faf5952378236eed4d468.tar.gz
Autogenerated HTML docs for v1.5.6.1-156-ge903b
Diffstat (limited to 'git-send-email.html')
-rw-r--r--git-send-email.html30
1 files changed, 24 insertions, 6 deletions
diff --git a/git-send-email.html b/git-send-email.html
index 934d29496..d92f086d5 100644
--- a/git-send-email.html
+++ b/git-send-email.html
@@ -272,7 +272,7 @@ git-send-email(1) Manual Page
</div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<p><em>git-send-email</em> [options] &lt;file|directory&gt; [&#8230; file|directory]</p>
+<p><em>git send-email</em> [options] &lt;file|directory&gt; [&#8230; file|directory]</p>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
@@ -476,13 +476,21 @@ specified (with --smtp-pass or a configuration variable), then the
user is prompted for a password while the input is masked for privacy.</p>
</dd>
<dt>
+--smtp-encryption
+</dt>
+<dd>
+<p>
+ Specify the encryption to use, either <em>ssl</em> or <em>tls</em>. Any other
+ value reverts to plain SMTP. Default is the value of
+ <em>sendemail.smtpencryption</em>.
+</p>
+</dd>
+<dt>
--smtp-ssl
</dt>
<dd>
<p>
- If set, connects to the SMTP server using SSL.
- Default is the value of the <em>sendemail.smtpssl</em> configuration value;
- if that is unspecified, does not use SSL.
+ Legacy alias for <em>--smtp-encryption=ssl</em>.
</p>
</dd>
<dt>
@@ -672,11 +680,21 @@ sendemail.smtppass
</p>
</dd>
<dt>
+sendemail.smtpencryption
+</dt>
+<dd>
+<p>
+ Default encryption method. Use <em>ssl</em> for SSL (and specify an
+ appropriate port), or <em>tls</em> for TLS. Takes precedence over
+ <em>smtpssl</em> if both are specified.
+</p>
+</dd>
+<dt>
sendemail.smtpssl
</dt>
<dd>
<p>
- Boolean value specifying the default to the <em>--smtp-ssl</em> parameter.
+ Legacy boolean that sets <em>smtpencryption=ssl</em> if enabled.
</p>
</dd>
</dl>
@@ -697,7 +715,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.</p>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 22:47:00 UTC
+Last updated 02-Jul-2008 03:02:01 UTC
</div>
</div>
</body>