X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-send-email.txt;h=7ae39fd5a20a869db8c2be101d7001c1c48ff198;hb=fdcb769916c93b53517ef1b4cae447a3333c9b86;hp=682313e95dc9b96d3cc14f33554ad82bcede9a56;hpb=0220f1ebdee113e02031de0dba2d5e2c8623d6bb;p=git.git

diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 682313e95..7ae39fd5a 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -54,7 +54,7 @@ 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.
@@ -68,8 +68,9 @@ The --cc option must be repeated for each user you want on the cc list.
 	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
@@ -85,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