aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-26 14:03:17 -0800
committerJunio C Hamano <gitster@pobox.com>2009-12-26 14:03:17 -0800
commita19f101e3f31234db23bd1eb24994db6e4caa443 (patch)
tree9774d35837562f4ccba2cc67db672dd958e1b3fb
parente74f43f9b702ccb88ee83e28de13ccfaebc4abf2 (diff)
parent41fe87fa49cbeec8f05c3e51d6ffd9c57f6c754c (diff)
downloadgit-a19f101e3f31234db23bd1eb24994db6e4caa443.tar.gz
git-a19f101e3f31234db23bd1eb24994db6e4caa443.tar.xz
Merge branch 'jc/1.7.0-send-email-no-thread-default'
* jc/1.7.0-send-email-no-thread-default: send-email: make --no-chain-reply-to the default Conflicts: git-send-email.perl
-rw-r--r--Documentation/git-send-email.txt6
-rwxr-xr-xgit-send-email.perl6
2 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 8c482f40b..ced35b2f5 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -84,7 +84,7 @@ See the CONFIGURATION section for 'sendemail.multiedit'.
--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 (the default)
+ 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.
@@ -172,8 +172,8 @@ Automating
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 the value of the 'sendemail.chainreplyto'
- configuration value; if that is unspecified, default to --chain-reply-to.
+ entire patch series. Disabled by default, but the 'sendemail.chainreplyto'
+ configuration variable can be used to enable it.
--identity=<identity>::
A configuration identity. When given, causes values in the
diff --git a/git-send-email.perl b/git-send-email.perl
index 319b53567..e05455f74 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -71,7 +71,7 @@ git send-email [options] <file | directory | rev-list options >
--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-]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.
Administering:
@@ -221,10 +221,10 @@ sub chain_reply_to {
if (defined $chain_reply_to &&
$chain_reply_to eq $not_set_by_user) {
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" .
"you want to keep --chain-reply-to as your default.\n";
- $chain_reply_to = 1;
+ $chain_reply_to = 0;
}
return $chain_reply_to;
}