Merge branch 'bc/http-backend-allow-405'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 44e7873521b05b78e0c5655e39a64c7b06cddb7e..b320b63b914714671eaedf5c641b5fb1287c00f2 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2183,6 +2183,13 @@ status.branch::
        Set to true to enable --branch by default in linkgit:git-status[1].
        The option --no-branch takes precedence over this variable.
 
+status.displayCommentPrefix::
+       If set to true, linkgit:git-status[1] will insert a comment
+       prefix before each output line (starting with
+       `core.commentChar`, i.e. `#` by default). This was the
+       behavior of linkgit:git-status[1] in Git 1.8.4 and previous.
+       Defaults to false.
+
 status.showUntrackedFiles::
        By default, linkgit:git-status[1] and linkgit:git-commit[1] show
        files which are not currently tracked by Git. Directories which