Documentation: clarify -u<mode> option defaults

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Clemens Buchacher 2011-02-21 21:05:25 +01:00 коммит произвёл Junio C Hamano
Родитель d5a719e4af
Коммит 4cc6260684
2 изменённых файлов: 14 добавлений и 14 удалений

Просмотреть файл

@ -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::

Просмотреть файл

@ -38,20 +38,20 @@ OPTIONS
-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 possible options are:
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:
+
--
- 'no' - Show no untracked files
- '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].
--ignore-submodules[=<when>]::
Ignore changes to submodules when looking for changes. <when> can be