undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/1.7.0-send-email-no-thread-default'

Browse Source 
* jc/1.7.0-send-email-no-thread-default:
  send-email: make --no-chain-reply-to the default

Conflicts:
	git-send-email.perl
This commit is contained in:
Junio C Hamano 2009-12-26 14:03:17 -08:00
commit a19f101e3f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/git-send-email.txt
View File

@ -84,7 +84,7 @@ See the CONFIGURATION section for 'sendemail.multiedit'.
--in-reply-to=<identifier>:: --in-reply-to=<identifier>::
Specify the contents of the first In-Reply-To header. 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) instead of this if --chain-reply-to is set.
Only necessary if --compose is also set. If --compose Only necessary if --compose is also set. If --compose
is not set, this will be prompted for. is not set, this will be prompted for.
@ -172,8 +172,8 @@ Automating
email sent. If disabled with "--no-chain-reply-to", all emails after 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 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 this, it is recommended that the first file given be an overview of the
entire patch series. Default is the value of the 'sendemail.chainreplyto' entire patch series. Disabled by default, but the 'sendemail.chainreplyto'
configuration value; if that is unspecified, default to --chain-reply-to. configuration variable can be used to enable it.
--identity=<identity>:: --identity=<identity>::
A configuration identity. When given, causes values in the A configuration identity. When given, causes values in the

6
git-send-email.perl
View File

@ -71,7 +71,7 @@ git send-email [options] <file | directory | rev-list options >
--suppress-cc <str> * author, self, sob, cc, cccmd, body, bodycc, all. --suppress-cc <str> * author, self, sob, cc, cccmd, body, bodycc, all.
--[no-]signed-off-by-cc * Send to Signed-off-by: addresses. Default on. --[no-]signed-off-by-cc * Send to Signed-off-by: addresses. Default on.
--[no-]suppress-from * Send to self. Default off. --[no-]suppress-from * Send to self. Default off.
--[no-]chain-reply-to * Chain In-Reply-To: fields. Default on. --[no-]chain-reply-to * Chain In-Reply-To: fields. Default off.
--[no-]thread * Use In-Reply-To: field. Default on. --[no-]thread * Use In-Reply-To: field. Default on.
Administering: Administering:
@ -221,10 +221,10 @@ sub chain_reply_to {
if (defined $chain_reply_to && if (defined $chain_reply_to &&
$chain_reply_to eq $not_set_by_user) { $chain_reply_to eq $not_set_by_user) {
print STDERR print STDERR
"In git 1.7.0, the default will be changed to --no-chain-reply-to\n" . "In git 1.7.0, the default has changed to --no-chain-reply-to\n" .
"Set sendemail.chainreplyto configuration variable to true if\n" . "Set sendemail.chainreplyto configuration variable to true if\n" .
"you want to keep --chain-reply-to as your default.\n"; "you want to keep --chain-reply-to as your default.\n";
$chain_reply_to = 1; $chain_reply_to = 0;
} }
return $chain_reply_to; return $chain_reply_to;
} }