Merge branch 'dg/subtree-test'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0f710ca3c2fcdfa552c15d346af6995b599b0af4..877cbc875ec38ef7dca9f3e2a2c860ea9a2f1790 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1245,6 +1245,10 @@ format.coverLetter::
        format-patch is invoked, but in addition can be set to "auto", to
        generate a cover-letter only when there's more than one patch.
 
+format.outputDirectory::
+       Set a custom directory to store the resulting files instead of the
+       current working directory.
+
 filter.<driver>.clean::
        The command which is used to convert the content of a worktree
        file to a blob upon checkin.  See linkgit:gitattributes[5] for