Documentation: clarify -u<mode> option defaults
Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Clemens Buchacher committed
Feb 21, 2011 at 21:05 UTC
4cc6260684207865344f5b9a7065284d564d4e61
2 files changed
+14
-14
Documentation/git-commit.txt
+6
-6
@@ -214,10 +214,11 @@ FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].)
214
215
-u[<mode>]::
216
--untracked-files[=<mode>]::
217
- Show untracked files (Default: 'all').
217
+ Show untracked files.
218
+
219
-The mode parameter is optional, and is used to specify
220
-the handling of untracked files.
219
+The mode parameter is optional (defaults to 'all'), and is used to
220
+specify the handling of untracked files; when -u is not used, the
221
+default is 'normal', i.e. show untracked files and directories.
222
+
223
The possible options are:
224
+
@@ -225,9 +226,8 @@ The possible options are:
226
- 'normal' - Shows untracked files and directories
227
- 'all' - Also shows individual files in untracked directories.
228
+
228
-See linkgit:git-config[1] for configuration variable
229
-used to change the default for when the option is not
230
-specified.
229
+The default can be changed using the status.showUntrackedFiles
230
+configuration variable documented in linkgit:git-config[1].
231
232
-v::
233
--verbose::
Documentation/git-status.txt
+8
-8
@@ -38,20 +38,20 @@ OPTIONS
38
39
-u[<mode>]::
40
--untracked-files[=<mode>]::
41
- Show untracked files (Default: 'all').
41
+ Show untracked files.
42
+
43
-The mode parameter is optional, and is used to specify
44
-the handling of untracked files. The possible options are:
43
+The mode parameter is optional (defaults to 'all'), and is used to
44
+specify the handling of untracked files; when -u is not used, the
45
+default is 'normal', i.e. show untracked files and directories.
46
++
47
+The possible options are:
48
+
46
---
49
- 'no' - Show no untracked files
50
- 'normal' - Shows untracked files and directories
51
- 'all' - Also shows individual files in untracked directories.
50
---
52
+
52
-See linkgit:git-config[1] for configuration variable
53
-used to change the default for when the option is not
54
-specified.
53
+The default can be changed using the status.showUntrackedFiles
54
+configuration variable documented in linkgit:git-config[1].
55
56
--ignore-submodules[=<when>]::
57
Ignore changes to submodules when looking for changes. <when> can be