From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 26 Dec 2009 22:03:17 +0000 (-0800)
Subject: Merge branch 'jc/1.7.0-send-email-no-thread-default'
X-Git-Tag: v1.7.0-rc0~144
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a19f101e3f31234db23bd1eb24994db6e4caa443;p=git.git

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
---

a19f101e3f31234db23bd1eb24994db6e4caa443
diff --cc git-send-email.perl
index 319b53567,c1d093033..e05455f74
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@@ -216,19 -213,6 +216,19 @@@ my %config_settings = 
      "from" => \$sender,
  );
  
 +# Help users prepare for 1.7.0
 +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;
 +}
 +
  # Handle Uncouth Termination
  sub signal_handler {