diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-02-21 22:46:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-21 22:46:09 -0800 |
| commit | dca3d715aa41cca8e1c02e78b1291992ad4dbb50 (patch) | |
| tree | b3527f389f6d120f18086e0e93a1fac952768a17 | |
| parent | a66cee2edeb503cb7a589ff9d9efa75dc8f0fedc (diff) | |
| parent | 4cc6260684207865344f5b9a7065284d564d4e61 (diff) | |
| download | git-dca3d715aa41cca8e1c02e78b1291992ad4dbb50.tar.gz | |
Merge branch 'maint'
* maint:
Documentation: clarify -u<mode> option defaults
| -rw-r--r-- | Documentation/git-commit.txt | 12 | ||||
| -rw-r--r-- | Documentation/git-status.txt | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index b586c0f442..8f89f6f08c 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/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:: diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index dae190a5f2..5102a23f8e 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -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 |