Merge branch 'master' into jc/fmt-patch

diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index bc85a6222157467683d3bec13feb17b09d331f25..7cc7fafc1d7fbe380ffa53e0d028886e15d0010e 100644 (file)
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -64,6 +64,15 @@ OPTIONS
        Create attachments instead of inlining patches.
 
 
+CONFIGURATION
+-------------
+You can specify extra mail header lines to be added to each
+message in the repository configuration as follows:
+
+[format]
+        headers = "Organization: git-foo\n"
+
+
 EXAMPLES
 --------