summaryrefslogtreecommitdiffstats
path: root/git-send-email.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-13 15:00:05 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-13 15:00:05 -0700
commit92d80370646a0ce43b0c769027492b3c891090aa (patch)
treecee7315334fee3145cb4badcc7a400e3e763fbac /git-send-email.html
parent48931e26012d8d7ad1a7e1d9701f52be1b77e45a (diff)
downloadgit-htmldocs-92d80370646a0ce43b0c769027492b3c891090aa.tar.gz
Autogenerated HTML docs for v2.9.1-273-g79ed4
Diffstat (limited to 'git-send-email.html')
-rw-r--r--git-send-email.html26
1 files changed, 13 insertions, 13 deletions
diff --git a/git-send-email.html b/git-send-email.html
index 5bb3b46c5..ef0d392b8 100644
--- a/git-send-email.html
+++ b/git-send-email.html
@@ -829,7 +829,7 @@ and the "Subject:" of the message as the second line.</p></div>
Invoke a text editor (see GIT_EDITOR in <a href="git-var.html">git-var(1)</a>)
to edit an introductory message for the patch series.
</p>
-<div class="paragraph"><p>When <em>--compose</em> is used, git send-email will use the From, Subject, and
+<div class="paragraph"><p>When <code>--compose</code> is used, git send-email will use the From, Subject, and
In-Reply-To headers specified in the message. If the body of the message
(what you type after the headers and a blank line) only contains blank
(or Git: prefixed) lines, the summary won&#8217;t be sent, but From, Subject,
@@ -1004,7 +1004,7 @@ is not set, this will be prompted for.</p></div>
</div></div>
<div class="paragraph"><p>If at least one of the specified mechanisms matches the ones advertised by the
SMTP server and if it is supported by the utilized SASL library, the mechanism
-is used for authentication. If neither <em>sendemail.smtpAuth</em> nor <em>--smtp-auth</em>
+is used for authentication. If neither <em>sendemail.smtpAuth</em> nor <code>--smtp-auth</code>
is specified, all mechanisms supported by the SASL library can be used.</p></div>
</dd>
<dt class="hdlist1">
@@ -1015,12 +1015,12 @@ is specified, all mechanisms supported by the SASL library can be used.</p></div
Password for SMTP-AUTH. The argument is optional: If no
argument is specified, then the empty string is used as
the password. Default is the value of <code>sendemail.smtpPass</code>,
- however <em>--smtp-pass</em> always overrides this value.
+ however <code>--smtp-pass</code> always overrides this value.
</p>
<div class="paragraph"><p>Furthermore, passwords need not be specified in configuration files
or on the command line. If a username has been specified (with
-<em>--smtp-user</em> or a <code>sendemail.smtpUser</code>), but no password has been
-specified (with <em>--smtp-pass</em> or <code>sendemail.smtpPass</code>), then
+<code>--smtp-user</code> or a <code>sendemail.smtpUser</code>), but no password has been
+specified (with <code>--smtp-pass</code> or <code>sendemail.smtpPass</code>), then
a password is obtained using <em>git-credential</em>.</p></div>
</dd>
<dt class="hdlist1">
@@ -1094,7 +1094,7 @@ must be used for each option.</p></div>
<dd>
<p>
Username for SMTP-AUTH. Default is the value of <code>sendemail.smtpUser</code>;
- if a username is not specified (with <em>--smtp-user</em> or <code>sendemail.smtpUser</code>),
+ if a username is not specified (with <code>--smtp-user</code> or <code>sendemail.smtpUser</code>),
then authentication is not attempted.
</p>
</dd>
@@ -1343,8 +1343,8 @@ have been specified, in which case default to <em>compose</em>.</p></div>
<dd>
<p>
When an argument may be understood either as a reference or as a file name,
- choose to understand it as a format-patch argument (<em>--format-patch</em>)
- or as a file name (<em>--no-format-patch</em>). By default, when such a conflict
+ choose to understand it as a format-patch argument (<code>--format-patch</code>)
+ or as a file name (<code>--no-format-patch</code>). By default, when such a conflict
occurs, git send-email will fail.
</p>
</dd>
@@ -1377,7 +1377,7 @@ Warn of patches that contain lines longer than 998 characters; this
</ul></div>
</div></div>
<div class="paragraph"><p>Default is the value of <code>sendemail.validate</code>; if this is not set,
-default to <em>--validate</em>.</p></div>
+default to <code>--validate</code>.</p></div>
</dd>
<dt class="hdlist1">
--force
@@ -1475,8 +1475,8 @@ sendemail.multiEdit
<dd>
<p>
If true (default), a single editor instance will be spawned to edit
- files you have to edit (patches when <em>--annotate</em> is used, and the
- summary when <em>--compose</em> is used). If false, files will be edited one
+ files you have to edit (patches when <code>--annotate</code> is used, and the
+ summary when <code>--compose</code> is used). If false, files will be edited one
after the other, spawning a new editor each time.
</p>
</dd>
@@ -1486,7 +1486,7 @@ sendemail.confirm
<dd>
<p>
Sets the default for whether to confirm before sending. Must be
- one of <em>always</em>, <em>never</em>, <em>cc</em>, <em>compose</em>, or <em>auto</em>. See <em>--confirm</em>
+ one of <em>always</em>, <em>never</em>, <em>cc</em>, <em>compose</em>, or <em>auto</em>. See <code>--confirm</code>
in the previous section for the meaning of these values.
</p>
</dd>
@@ -1550,7 +1550,7 @@ $ git send-email outgoing/*</code></pre>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2016-06-27 11:04:05 PDT
+Last updated 2016-07-13 14:58:50 PDT
</div>
</div>
</body>