author | Junio C Hamano <gitster@pobox.com> | |
Wed, 27 Oct 2010 04:52:26 +0000 (21:52 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 27 Oct 2010 04:52:26 +0000 (21:52 -0700) |
* jp/send-email-to-cmd:
git-send-email.perl: Add --to-cmd
Conflicts:
git-send-email.perl
git-send-email.perl: Add --to-cmd
Conflicts:
git-send-email.perl
1 | 2 | |||
---|---|---|---|---|
Documentation/git-send-email.txt | patch | | diff1 | | diff2 | | blob | history |
git-send-email.perl | patch | | diff1 | | diff2 | | blob | history |
t/t9001-send-email.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/git-send-email.txt
Simple merge
diff --cc git-send-email.perl
index 458e86afdedfbad45f12ec1910735c617ffbe8c7,a73b655e417df641b8213734aa3ba19bd9914973..897bf5960a4220005f4ddc80ec1942136515298b
--- 1/git-send-email.perl
--- 2/git-send-email.perl
+++ b/git-send-email.perl
}
# 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);
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,
diff --cc t/t9001-send-email.sh
Simple merge