diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:26:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:26:54 -0800 |
| commit | 2374f1dfd12542d171b60065dc139a96cb0efe29 (patch) | |
| tree | c7127d33f2a05bfc90c6785bbcaa7f5a2c901fb7 /Documentation | |
| parent | fa7f51d53385ee64858a415f817d6b8485197405 (diff) | |
| parent | 8d8140843501107c92e2f9a5acb60ee136352c1f (diff) | |
| download | git-2374f1dfd12542d171b60065dc139a96cb0efe29.tar.gz | |
Merge branch 'pb/send-email-te'
"git send-email" learned "--transfer-encoding" option to force
a non-fault Content-Transfer-Encoding header (e.g. base64).
* pb/send-email-te:
git-send-email: add --transfer-encoding option
git-send-email: delay creation of MIME headers
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 1 | ||||
| -rw-r--r-- | Documentation/git-send-email.txt | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 9335ff2ae2..b563ea8d34 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2318,6 +2318,7 @@ sendemail.smtpserverport:: sendemail.smtpserveroption:: sendemail.smtpuser:: sendemail.thread:: +sendemail.transferencoding:: sendemail.validate:: See linkgit:git-send-email[1] for description. diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index a60776eb57..a9efa5c2ec 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -131,6 +131,16 @@ Note that no attempts whatsoever are made to validate the encoding. Specify encoding of compose message. Default is the value of the 'sendemail.composeencoding'; if that is unspecified, UTF-8 is assumed. +--transfer-encoding=(7bit|8bit|quoted-printable|base64):: + Specify the transfer encoding to be used to send the message over SMTP. + 7bit will fail upon encountering a non-ASCII message. quoted-printable + can be useful when the repository contains files that contain carriage + returns, but makes the raw patch email file (as saved from a MUA) much + harder to inspect manually. base64 is even more fool proof, but also + even more opaque. Default is the value of the 'sendemail.transferEncoding' + configuration value; if that is unspecified, git will use 8bit and not + add a Content-Transfer-Encoding header. + Sending ~~~~~~~ |