Autogenerated HTML docs for v1.6.3.1-244-gf9275

1 files changed, 25 insertions, 23 deletions

diff --git a/git-send-email.html b/git-send-email.html
index 3d6fd2d45..d9a588685 100644
--- a/git-send-email.html
+++ b/git-send-email.html
@@ -352,6 +352,15 @@ and the "Subject:" of the message as the second line.</p></div>
 <h3 id="_composing">Composing</h3><div style="clear:left"></div>

 <div class="vlist"><dl>

 <dt>

+--annotate

+</dt>

+<dd>

+<p>

+        Review and edit each patch you're about to send. See the

+        CONFIGURATION section for <em>sendemail.multiedit</em>.

+</p>

+</dd>

+<dt>

 --bcc=&lt;address&gt;

 </dt>

 <dd>

@@ -372,16 +381,6 @@ and the "Subject:" of the message as the second line.</p></div>
 <div class="para"><p>The --cc option must be repeated for each user you want on the cc list.</p></div>

 </dd>

 <dt>

---annotate

-</dt>

-<dd>

-<p>

-        Review each patch you're about to send in an editor. The setting

-        <em>sendemail.multiedit</em> defines if this will spawn one editor per patch

-        or one for all of them at once.

-</p>

-</dd>

-<dt>

 --compose

 </dt>

 <dd>

@@ -395,6 +394,7 @@ In-Reply-To headers specified in the message. If the body of the message
 (or GIT: prefixed) lines the summary won't be sent, but From, Subject,

 and In-Reply-To headers will be used unless they are removed.</p></div>

 <div class="para"><p>Missing From or In-Reply-To headers will be prompted for.</p></div>

+<div class="para"><p>See the CONFIGURATION section for <em>sendemail.multiedit</em>.</p></div>

 </dd>

 <dt>

 --from=&lt;address&gt;

@@ -507,7 +507,9 @@ user is prompted for a password while the input is masked for privacy.</p></div>
 <p>

         Specifies a port different from the default port (SMTP

         servers typically listen to smtp port 25 and ssmtp port

-        465). This can be set with <em>sendemail.smtpserverport</em>.

+        465); symbolic port names (e.g. "submission" instead of 465)

+        are also accepted. The port can also be set with the

+        <em>sendemail.smtpserverport</em> configuration variable.

 </p>

 </dd>

 <dt>

@@ -705,6 +707,17 @@ have been specified, in which case default to <em>compose</em>.</p></div>
 </p>

 </dd>

 <dt>

+--[no-]format-patch

+</dt>

+<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

+        occurs, git send-email will fail.

+</p>

+</dd>

+<dt>

 --quiet

 </dt>

 <dd>

@@ -732,17 +745,6 @@ Warn of patches that contain lines longer than 998 characters; this
 <div class="para"><p>Default is the value of <em>sendemail.validate</em>; if this is not set,

 default to <em>--validate</em>.</p></div>

 </dd>

-<dt>

---[no-]format-patch

-</dt>

-<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

-        occurs, git send-email will fail.

-</p>

-</dd>

 </dl></div>

 </div>

 <h2 id="_configuration">CONFIGURATION</h2>

@@ -805,7 +807,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2009-05-23 09:53:15 UTC

+Last updated 2009-06-01 01:22:21 UTC

 </div>

 </div>

 </body>