Merge branch 'maint'

diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index a9efa5c2ec18776e12c5bdbb250df5b8e0f41581..e04849e3961257500f86441611e738e9b4d0f330 100644 (file)
--- 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
 ~~~~~~~