summaryrefslogtreecommitdiffstats
path: root/git-commit.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2011-02-22 07:51:32 +0000
committerJunio C Hamano <junio@kernel.org>2011-02-22 07:51:32 +0000
commit36a4dbcbf885a8894517a812f69e3d8c31540f84 (patch)
tree98f8bef4b3b51e895522614ce0fa1afe61552f44 /git-commit.txt
parent25c766e9a8b9605170ac163df933da0c7f0bc5ae (diff)
downloadgit-htmldocs-36a4dbcbf885a8894517a812f69e3d8c31540f84.tar.gz
Autogenerated HTML docs for v1.7.4.1-55-gdca3d
Diffstat (limited to 'git-commit.txt')
-rw-r--r--git-commit.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/git-commit.txt b/git-commit.txt
index b586c0f44..8f89f6f08 100644
--- a/git-commit.txt
+++ b/git-commit.txt
@@ -214,10 +214,11 @@ FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].)
-u[<mode>]::
--untracked-files[=<mode>]::
- Show untracked files (Default: 'all').
+ Show untracked files.
+
-The mode parameter is optional, and is used to specify
-the handling of untracked files.
+The mode parameter is optional (defaults to 'all'), and is used to
+specify the handling of untracked files; when -u is not used, the
+default is 'normal', i.e. show untracked files and directories.
+
The possible options are:
+
@@ -225,9 +226,8 @@ The possible options are:
- 'normal' - Shows untracked files and directories
- 'all' - Also shows individual files in untracked directories.
+
-See linkgit:git-config[1] for configuration variable
-used to change the default for when the option is not
-specified.
+The default can be changed using the status.showUntrackedFiles
+configuration variable documented in linkgit:git-config[1].
-v::
--verbose::