summaryrefslogtreecommitdiffstats
path: root/git-send-email.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-06-14 15:32:20 +0900
committerJunio C Hamano <gitster@pobox.com>2021-06-14 15:32:20 +0900
commit01009d54ee08e7b28b2cd86ae8c30f8adaf00d89 (patch)
tree8416010a459a1187ca773c0c433859ceea58f466 /git-send-email.html
parent37c77fd2893de182d484f65cca6ba011fe633019 (diff)
downloadgit-htmldocs-01009d54ee08e7b28b2cd86ae8c30f8adaf00d89.tar.gz
Autogenerated HTML docs for v2.32.0-93-g670b8
Diffstat (limited to 'git-send-email.html')
-rw-r--r--git-send-email.html33
1 files changed, 24 insertions, 9 deletions
diff --git a/git-send-email.html b/git-send-email.html
index eabc3b5d8..61c5adf33 100644
--- a/git-send-email.html
+++ b/git-send-email.html
@@ -981,6 +981,19 @@ value; if that is unspecified, default to <code>auto</code>.</p></div>
</p>
</dd>
<dt class="hdlist1">
+--sendmail-cmd=&lt;command&gt;
+</dt>
+<dd>
+<p>
+ Specify a command to run to send the email. The command should
+ be sendmail-like; specifically, it must support the <code>-i</code> option.
+ The command will be executed in the shell if necessary. Default
+ is the value of <code>sendemail.sendmailcmd</code>. If unspecified, and if
+ --smtp-server is also unspecified, git-send-email will search
+ for <code>sendmail</code> in <code>/usr/sbin</code>, <code>/usr/lib</code> and $PATH.
+</p>
+</dd>
+<dt class="hdlist1">
--smtp-encryption=&lt;encryption&gt;
</dt>
<dd>
@@ -1051,14 +1064,16 @@ a password is obtained using <em>git-credential</em>.</p></div>
<dd>
<p>
If set, specifies the outgoing SMTP server to use (e.g.
- <code>smtp.example.com</code> or a raw IP address). Alternatively it can
- specify a full pathname of a sendmail-like program instead;
- the program must support the <code>-i</code> option. Default value can
- be specified by the <code>sendemail.smtpServer</code> configuration
- option; the built-in default is to search for <code>sendmail</code> in
- <code>/usr/sbin</code>, <code>/usr/lib</code> and $PATH if such program is
- available, falling back to <code>localhost</code> otherwise.
-</p>
+ <code>smtp.example.com</code> or a raw IP address). If unspecified, and if
+ <code>--sendmail-cmd</code> is also unspecified, the default is to search
+ for <code>sendmail</code> in <code>/usr/sbin</code>, <code>/usr/lib</code> and $PATH if such a
+ program is available, falling back to <code>localhost</code> otherwise.
+</p>
+<div class="paragraph"><p>For backward compatibility, this option can also specify a full pathname
+of a sendmail-like program instead; the program must support the <code>-i</code>
+option. This method does not support passing arguments or using plain
+command names. For those use cases, consider using <code>--sendmail-cmd</code>
+instead.</p></div>
</dd>
<dt class="hdlist1">
--smtp-server-port=&lt;port&gt;
@@ -1631,7 +1646,7 @@ Authen::SASL and Mail::Address.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2021-01-26 08:29:19 JST
+ 2021-06-14 15:29:11 JST
</div>
</div>
</body>