difftool: add support for a difftool.prompt config variable

diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index c105925df8f3e56c6d660a8f88fa5d7c2c935b92..eb2fbcff1a103c2b973eccbb449a20d3b68f157f 100644 (file)
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -157,6 +157,11 @@ if that is not set.
        Add a "Cc:" header to the email headers. This is in addition
        to any configured headers, and may be used multiple times.
 
+--add-header=<header>::
+       Add an arbitrary header to the email headers.  This is in addition
+       to any configured headers, and may be used multiple times.
+       For example, --add-header="Organization: git-foo"
+
 --cover-letter::
        In addition to the patches, generate a cover letter file
        containing the shortlog and the overall diffstat.  You can
@@ -200,6 +205,7 @@ more than one.
        numbered = auto
        cc = <email>
        attach [ = mime-boundary-string ]
+       signoff = true
 ------------