Merge branch 'mm/pager-less-sans-S'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index f57b0e2fcf13ce23a349b011ba75486bbd171a8d..9c4ceb3c270fbc07bb6d94fc59cf14e4b0636b20 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1345,6 +1345,10 @@ gui.diffcontext::
        Specifies how many context lines should be used in calls to diff
        made by the linkgit:git-gui[1]. The default is "5".
 
+gui.displayuntracked::
+       Determines if linkgit::git-gui[1] shows untracked files
+       in the file list. The default is "true".
+
 gui.encoding::
        Specifies the default encoding to use for displaying of
        file contents in linkgit:git-gui[1] and linkgit:gitk[1].