author | Junio C Hamano <gitster@pobox.com> | |
Sun, 27 Jun 2010 19:07:45 +0000 (12:07 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 27 Jun 2010 19:07:45 +0000 (12:07 -0700) |
* tr/send-email-8bit:
send-email: ask about and declare 8bit mails
send-email: ask about and declare 8bit mails
1 | 2 | |||
---|---|---|---|---|
Documentation/git-send-email.txt | patch | | diff1 | | diff2 | | blob | history |
git-send-email.perl | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/git-send-email.txt
Simple merge
diff --cc git-send-email.perl
index 111c981229bf2c0bc6afa4a22db011b68d93fdfa,0db39b0de4c01118a627ad0e8f9589e7df27e34c..6dab3bf6a74bb52c7294e33dbac5bf87b51a9fdf
--- 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 ($smtp_server, $smtp_server_port, $smtp_authuser, $smtp_encryption);
-my ($identity, $aliasfiletype, @alias_files, @smtp_host_parts);
+my ($identity, $aliasfiletype, @alias_files, @smtp_host_parts, $smtp_domain);
my ($validate, $confirm);
my (@suppress_cc);
+ my ($auto_8bit_encoding);
my ($debug_net_smtp) = 0; # Net::SMTP, see send_message()