Merge branch 'jc/t2300-setup' into HEAD

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 54253d163590091cba2d1f3ed5215c59b65a81ae..53f00dbc267db194c7c5558a008fd9d8ec20068c 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1141,6 +1141,10 @@ commit.template::
        Specify the pathname of a file to use as the template for
        new commit messages.
 
+commit.verbose::
+       A boolean or int to specify the level of verbose with `git commit`.
+       See linkgit:git-commit[1].
+
 credential.helper::
        Specify an external helper to be called when a username or
        password credential is needed; the helper may consult external
@@ -1290,6 +1294,10 @@ format.outputDirectory::
        Set a custom directory to store the resulting files instead of the
        current working directory.
 
+format.useAutoBase::
+       A boolean value which lets you enable the `--base=auto` option of
+       format-patch by default.
+
 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