Merge branch 'mk/doc-git-gui-display-untracked'

* mk/doc-git-gui-display-untracked:
  Documentation: git-gui: describe gui.displayuntracked

diff --git a/Documentation/config.txt b/Documentation/config.txt
index d8b6cc9654e24c6644986d60ca40eb6d264e6ca8..1932e9b9a2be5437dd467f91472318a5bf1bb992 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1340,6 +1340,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].