From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Oct 2010 04:52:26 +0000 (-0700)
Subject: Merge branch 'jp/send-email-to-cmd'
X-Git-Tag: v1.7.4-rc0~164
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9b1054d93e7e8564d0d9865cb7118cb6e756c74b;p=git.git

Merge branch 'jp/send-email-to-cmd'

* jp/send-email-to-cmd:
  git-send-email.perl: Add --to-cmd

Conflicts:
	git-send-email.perl
---

9b1054d93e7e8564d0d9865cb7118cb6e756c74b
diff --cc git-send-email.perl
index 458e86afd,a73b655e4..897bf5960
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@@ -191,10 -188,10 +192,11 @@@ sub do_edit 
  }
  
  # Variables with corresponding config settings
- my ($thread, $chain_reply_to, $suppress_from, $signed_off_by_cc, $cc_cmd);
+ my ($thread, $chain_reply_to, $suppress_from, $signed_off_by_cc);
+ my ($to_cmd, $cc_cmd);
 -my ($smtp_server, $smtp_server_port, $smtp_authuser, $smtp_encryption);
 -my ($identity, $aliasfiletype, @alias_files, @smtp_host_parts, $smtp_domain);
 +my ($smtp_server, $smtp_server_port, @smtp_server_options);
 +my ($smtp_authuser, $smtp_encryption);
 +my ($identity, $aliasfiletype, @alias_files, $smtp_domain);
  my ($validate, $confirm);
  my (@suppress_cc);
  my ($auto_8bit_encoding);
@@@ -215,11 -212,11 +217,12 @@@ my %config_bool_settings = 
  my %config_settings = (
      "smtpserver" => \$smtp_server,
      "smtpserverport" => \$smtp_server_port,
 +    "smtpserveroption" => \@smtp_server_options,
      "smtpuser" => \$smtp_authuser,
      "smtppass" => \$smtp_authpass,
 -	"smtpdomain" => \$smtp_domain,
 +    "smtpdomain" => \$smtp_domain,
      "to" => \@to,
+     "tocmd" => \$to_cmd,
      "cc" => \@initial_cc,
      "cccmd" => \$cc_cmd,
      "aliasfiletype" => \$aliasfiletype,