deprecate the new loose object header format

diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 35b0104e4acbe614fb274c1ee36d6a4ab2ea5849..7ae39fd5a20a869db8c2be101d7001c1c48ff198 100644 (file)
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -40,7 +40,8 @@ The --cc option must be repeated for each user you want on the cc list.
        the first will be sent as replies to the first email sent.  When using
        this, it is recommended that the first file given be an overview of the
        entire patch series.
-       Default is --chain-reply-to
+       Default is the value of the 'sendemail.chainreplyto' configuration
+       value; if that is unspecified, default to --chain-reply-to.
 
 --compose::
        Use $EDITOR to edit an introductory message for the
@@ -53,21 +54,23 @@ The --cc option must be repeated for each user you want on the cc list.
 
 --in-reply-to::
        Specify the contents of the first In-Reply-To header.
-       Subsequent emails will refer to the previous email 
+       Subsequent emails will refer to the previous email
        instead of this if --chain-reply-to is set (the default)
        Only necessary if --compose is also set.  If --compose
        is not set, this will be prompted for.
 
 --no-signed-off-by-cc::
-       Do not add emails found in Signed-off-by: lines to the cc list.
+       Do not add emails found in Signed-off-by: or Cc: lines to the
+       cc list.
 
 --quiet::
        Make git-send-email less verbose.  One line per email should be
        all that is output.
 
 --smtp-server::
-       If set, specifies the outgoing SMTP server to use.  A full
-       pathname of a sendmail-like program can be specified instead;
+       If set, specifies the outgoing SMTP server to use (e.g.
+       `smtp.example.com` or a raw IP address).  Alternatively it can
+       specify a full pathname of a sendmail-like program instead;
        the program must support the `-i` option.  Default value can
        be specified by the 'sendemail.smtpserver' configuration
        option; the built-in default is `/usr/sbin/sendmail` or
@@ -83,6 +86,15 @@ The --cc option must be repeated for each user you want on the cc list.
        Do not add the From: address to the cc: list, if it shows up in a From:
        line.
 
+--dry-run::
+       Do everything except actually send the emails.
+
+--envelope-sender::
+       Specify the envelope sender used to send the emails.
+       This is useful if your default address is not the address that is
+       subscribed to a list. If you use the sendmail binary, you must have
+       suitable privileges for the -f parameter.
+
 --to::
        Specify the primary recipient of the emails generated.
        Generally, this will be the upstream maintainer of the
@@ -91,6 +103,26 @@ The --cc option must be repeated for each user you want on the cc list.
 The --to option must be repeated for each user you want on the to list.
 
 
+CONFIGURATION
+-------------
+sendemail.aliasesfile::
+       To avoid typing long email addresses, point this to one or more
+       email aliases files.  You must also supply 'sendemail.aliasfiletype'.
+
+sendemail.aliasfiletype::
+       Format of the file(s) specified in sendemail.aliasesfile. Must be
+       one of 'mutt', 'mailrc', 'pine', or 'gnus'.
+
+sendemail.bcc::
+       Email address (or alias) to always bcc.
+
+sendemail.chainreplyto::
+       Boolean value specifying the default to the '--chain_reply_to'
+       parameter.
+
+sendemail.smtpserver::
+       Default smtp server to use.
+
 Author
 ------
 Written by Ryan Anderson <ryan@michonline.com>