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

diff --cc Documentation/config.txt
index 6862e3e30155b7139c960ce2f42f5fba96f11886,82b1d3d9224b68b66823a1873f75d7a022151e1e..cc887b1279cb04c33cc2e67c373c6ed61daff520
--- 1/Documentation/config.txt
--- 2/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 a9efa5c2ec18776e12c5bdbb250df5b8e0f41581,a0bd806cfed82d55351b9c90fbd6fb895846b284..e04849e3961257500f86441611e738e9b4d0f330
--- 1/Documentation/git-send-email.txt
--- 2/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
  ~~~~~~~

diff --cc git-send-email.perl
Simple merge

diff --cc t/t9001-send-email.sh
Simple merge