Merge branch 'dl/format-patch-cover-from-desc'

[thirdparty/git.git] / Documentation / config / format.txt

diff --git a/Documentation/config/format.txt b/Documentation/config/format.txt
index 40cad9278fd1734ce5bc7445611dbeb70d00168d..513fcd88d5b934bedfcb95909cd0593a39687b2e 100644 (file)
--- a/Documentation/config/format.txt
+++ b/Documentation/config/format.txt
@@ -36,6 +36,12 @@ format.subjectPrefix::
        The default for format-patch is to output files with the '[PATCH]'
        subject prefix. Use this variable to change that prefix.
 
+format.coverFromDescription::
+       The default mode for format-patch to determine which parts of
+       the cover letter will be populated using the branch's
+       description. See the `--cover-from-description` option in
+       linkgit:git-format-patch[1].
+
 format.signature::
        The default for format-patch is to output a signature containing
        the Git version number. Use this variable to change that default.