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

* mk/doc-git-gui-display-untracked:
  Documentation: git-gui: describe gui.displayuntracked
This commit is contained in:
Junio C Hamano 2014-05-02 13:10:47 -07:00
commit b809658141

View file

@ -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].