development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-25 02:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Documentation: clarify -u<mode> option defaults

Browse source 
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 committed by Junio C Hamano
parent d5a719e4af
commit 4cc6260684
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Documentation/git-commit.txt
View file

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

16
Documentation/git-status.txt
View file

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