summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-01-07 22:07:27 +0100
committerJunio C Hamano <gitster@pobox.com>2015-01-07 22:07:27 +0100
commit5095fa61e38c92cbc8c603880f04f0d6127ae72e (patch)
tree30a2f235d0e73ee3c7e1dac76b1c3d20c30923a0 /Documentation
parentMerge branch 'rd/send-email-2047-fix' (diff)
parenttest/send-email: --[no-]xmailer tests (diff)
downloadgit-5095fa61e38c92cbc8c603880f04f0d6127ae72e.tar.xz
git-5095fa61e38c92cbc8c603880f04f0d6127ae72e.zip
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
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt1
-rw-r--r--Documentation/git-send-email.txt5
2 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 6862e3e301..cc887b1279 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2329,6 +2329,7 @@ sendemail.smtpuser::
sendemail.thread::
sendemail.transferencoding::
sendemail.validate::
+sendemail.xmailer::
See linkgit:git-send-email[1] for description.
sendemail.signedoffcc::
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index a9efa5c2ec..e04849e396 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -141,6 +141,11 @@ Note that no attempts whatsoever are made to validate the encoding.
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
~~~~~~~