Merge early part of 'jc/combine' branch

diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 9ac063685079d9c887cdc598f2acddeadf2f3252..7cc7fafc1d7fbe380ffa53e0d028886e15d0010e 100644 (file)
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -3,13 +3,13 @@ git-format-patch(1)
 
 NAME
 ----
-git-format-patch - Prepare patches for e-mail submission.
+git-format-patch - Prepare patches for e-mail submission
 
 
 SYNOPSIS
 --------
 [verse]
-'git-format-patch' [-n | -k] [-o <dir> | --stdout] [-s] [-c]
+'git-format-patch' [-n | -k] [-o <dir> | --stdout] [--attach] [-s] [-c]
                 [--diff-options] <his> [<mine>]
 
 DESCRIPTION
@@ -60,6 +60,18 @@ OPTIONS
        standard output, instead of saving them into a file per
        patch and implies --mbox.
 
+--attach::
+       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
 --------