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

* mk/doc-git-gui-display-untracked: Documentation: git-gui: describe gui.displayuntracked
git-mirror · May 2, 2014 · b809658 · b809658
2 parents 7e76a2f + ec9fa62
commit b809658
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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].