aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-28 16:19:03 -0700
committerJunio C Hamano <gitster@pobox.com>2010-06-28 16:19:03 -0700
commit54fcb21b899eefc299c4ad94d2f2e229c72d3be5 (patch)
treef5f1f2d31e92e6076dfa789528d8f422ca5d32e2 /Documentation
parentd60ad81e6806c6dc8778fa3900caa8fd7c061fb4 (diff)
parent3cae7e5b2b9c73aca6a7729bc34c1ce6638fa43a (diff)
downloadgit-54fcb21b899eefc299c4ad94d2f2e229c72d3be5.tar.gz
git-54fcb21b899eefc299c4ad94d2f2e229c72d3be5.tar.xz
Merge branch 'tr/send-email-8bit' into maint
* tr/send-email-8bit: send-email: ask about and declare 8bit mails
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-send-email.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 12622fc49..c28308427 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -101,6 +101,15 @@ See the CONFIGURATION section for 'sendemail.multiedit'.
+
The --to option must be repeated for each user you want on the to list.
+--8bit-encoding=<encoding>::
+ When encountering a non-ASCII message or subject that does not
+ declare its encoding, add headers/quoting to indicate it is
+ encoded in <encoding>. Default is the value of the
+ 'sendemail.assume8bitEncoding'; if that is unspecified, this
+ will be prompted for if any non-ASCII files are encountered.
++
+Note that no attempts whatsoever are made to validate the encoding.
+
Sending
~~~~~~~