X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fgit-send-email-script.txt;h=9ad82cc3e4a95419d4a3aa006d124371037da3fb;hb=0516de30e8bdd26086e2a3edd3375981fd0c34d6;hp=97d5baed0587f7217bd70cbbe9aa813e72f77c2b;hpb=479cec960c20a5022e2cfc7e46c88817d8540758;p=git.git

diff --git a/Documentation/git-send-email-script.txt b/Documentation/git-send-email-script.txt
index 97d5baed..9ad82cc3 100644
--- a/Documentation/git-send-email-script.txt
+++ b/Documentation/git-send-email-script.txt
@@ -33,16 +33,34 @@ The options available are:
 	the value GIT_COMMITTER_IDENT, as returned by "git-var -l".
 	The user will still be prompted to confirm this entry.
 
+   --compose
+	Use \$EDITOR to edit an introductory message for the
+	patch series.
+
    --subject
    	Specify the initial subject of the email thread.
+	Only necessary if --compose is also set.  If --compose
+	is not set, this will be prompted for.
 
    --in-reply-to
 	Specify the contents of the first In-Reply-To header.
 	Subsequent emails will refer to the previous email 
-	instead of this.
-	When overriding on the command line, it may be necessary
-	to set this to a space.  For example
-		--in-reply-to=" "
+	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.
+
+   --chain-reply-to, --no-chain-reply-to
+	If this is set, each email will be sent as a reply to the previous
+	email sent.  If disabled with "--no-chain-reply-to", all emails after
+	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
+
+   --smtp-server
+	If set, specifies the outgoing SMTP server to use.  Defaults to
+	localhost.
+
 
 Author
 ------