Merge branch 'nd/switch-and-restore'

diff --git a/Documentation/config/format.txt b/Documentation/config/format.txt
index 414a5a8a9d7de5bbcefd928ada93aed725427b33..cb629fa769b7ffb61f4c825894a450aea2e8c1e2 100644 (file)
--- a/Documentation/config/format.txt
+++ b/Documentation/config/format.txt
@@ -77,6 +77,7 @@ format.coverLetter::
        A boolean that controls whether to generate a cover-letter when
        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.
+       Default is false.
 
 format.outputDirectory::
        Set a custom directory to store the resulting files instead of the