From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 7 Jan 2015 21:07:27 +0000 (-0800)
Subject: Merge branch 'lh/send-email-hide-x-mailer'
X-Git-Tag: v2.3.0-rc0~19
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5095fa61e38c92cbc8c603880f04f0d6127ae72e

Merge branch 'lh/send-email-hide-x-mailer'

"git send-email" normally identifies itself via X-Mailer: header
in the message it sends out.  A new command line flag allows the
user to squelch the header.

* lh/send-email-hide-x-mailer:
test/send-email: --[no-]xmailer tests
send-email: add --[no-]xmailer option
---

5095fa61e38c92cbc8c603880f04f0d6127ae72e
diff --cc Documentation/config.txt
index 6862e3e301,82b1d3d922..cc887b1279
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -2327,8 -2259,8 +2327,9 @@@ sendemail.smtpserverport:
  sendemail.smtpserveroption::
  sendemail.smtpuser::
  sendemail.thread::
 +sendemail.transferencoding::
  sendemail.validate::
+ sendemail.xmailer::
  	See linkgit:git-send-email[1] for description.
  
  sendemail.signedoffcc::
diff --cc Documentation/git-send-email.txt
index a9efa5c2ec,a0bd806cfe..e04849e396
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@@ -131,16 -131,11 +131,21 @@@ Note that no attempts whatsoever are ma
  	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.
 +
+ --xmailer::
+ --no-xmailer::
+ 	Add (or prevent adding) the "X-Mailer:" header.  By default,
+ 	the header is added, but it can be turned off by setting the
+ 	`sendemail.xmailer` configuration variable to `false`.
  
  Sending
  ~~~~~~~