aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-05-02 13:10:47 -0700
committerJunio C Hamano <gitster@pobox.com>2014-05-02 13:10:47 -0700
commitb809658141574ed34c77d3b6fdf91748a2ee13f3 (patch)
tree59d8bb75a5298f9db73e2edaa49f6281232866dc
parent7e76a2f97546444fe7a2af18825450e29c3622a4 (diff)
parentec9fa62a10dc5c4d99f3b35f129fa964e23dfaa8 (diff)
downloadgit-b809658141574ed34c77d3b6fdf91748a2ee13f3.tar.gz
Merge branch 'mk/doc-git-gui-display-untracked'
* mk/doc-git-gui-display-untracked: Documentation: git-gui: describe gui.displayuntracked
-rw-r--r--Documentation/config.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index d8b6cc9654..1932e9b9a2 100644
--- 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].