From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 11 Dec 2010 00:36:19 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.4-rc0~67
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/271c2aa6eed21d4ef9d8d6c2298121545e6ce123?ds=inline;hp=-c

Merge branch 'maint'
---

271c2aa6eed21d4ef9d8d6c2298121545e6ce123
diff --combined Documentation/git-send-email.txt
index ebc024ae3d,adbca12b1e..7ec9dabe68
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@@ -82,26 -82,11 +82,26 @@@ See the CONFIGURATION section for 'send
  	set, as returned by "git var -l".
  
  --in-reply-to=<identifier>::
 -	Specify the contents of the first In-Reply-To header.
 -	Subsequent emails will refer to the previous email
 -	instead of this if --chain-reply-to is set.
 -	Only necessary if --compose is also set.  If --compose
 -	is not set, this will be prompted for.
 +	Make the first mail (or all the mails with `--no-thread`) appear as a
 +	reply to the given Message-Id, which avoids breaking threads to
 +	provide a new patch series.
 +	The second and subsequent emails will be sent as replies according to
 +	the `--[no]-chain-reply-to` setting.
 ++
 +So for example when `--thread` and `--no-chain-reply-to` are specified, the
 +second and subsequent patches will be replies to the first one like in the
 +illustration below where `[PATCH v2 0/3]` is in reply to `[PATCH 0/2]`:
 ++
 +  [PATCH 0/2] Here is what I did...
 +    [PATCH 1/2] Clean up and tests
 +    [PATCH 2/2] Implementation
 +    [PATCH v2 0/3] Here is a reroll
 +      [PATCH v2 1/3] Clean up
 +      [PATCH v2 2/3] New tests
 +      [PATCH v2 3/3] Implementation
 ++
 +Only necessary if --compose is also set.  If --compose
 +is not set, this will be prompted for.
  
  --subject=<string>::
  	Specify the initial subject of the email thread.
@@@ -112,7 -97,7 +112,7 @@@
  	Specify the primary recipient of the emails generated. Generally, this
  	will be the upstream maintainer of the project involved. Default is the
  	value of the 'sendemail.to' configuration value; if that is unspecified,
 -	this will be prompted for.
 +	and --to-cmd is not specified, this will be prompted for.
  +
  The --to option must be repeated for each user you want on the to list.
  
@@@ -180,15 -165,6 +180,15 @@@ user is prompted for a password while t
  	are also accepted. The port can also be set with the
  	'sendemail.smtpserverport' configuration variable.
  
 +--smtp-server-option=<option>::
 +	If set, specifies the outgoing SMTP server option to use.
 +	Default value can be specified by the 'sendemail.smtpserveroption'
 +	configuration option.
 ++
 +The --smtp-server-option option must be repeated for each option you want
 +to pass to the server. Likewise, different lines in the configuration files
 +must be used for each option.
 +
  --smtp-ssl::
  	Legacy alias for '--smtp-encryption ssl'.
  
@@@ -201,12 -177,6 +201,12 @@@
  Automating
  ~~~~~~~~~~
  
 +--to-cmd=<command>::
 +	Specify a command to execute once per patch file which
 +	should generate patch file specific "To:" entries.
 +	Output of this command must be single email address per line.
 +	Default is the value of 'sendemail.tocmd' configuration value.
 +
  --cc-cmd=<command>::
  	Specify a command to execute once per patch file which
  	should generate patch file specific "Cc:" entries.
@@@ -322,6 -292,9 +322,9 @@@ have been specified, in which case defa
  Default is the value of 'sendemail.validate'; if this is not set,
  default to '--validate'.
  
+ --force::
+ 	Send emails even if safety checks would prevent it.
+ 
  
  CONFIGURATION
  -------------