diff options
| author | Clemens Buchacher <drizzd@aon.at> | 2011-02-21 21:05:25 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-21 21:48:55 -0800 |
| commit | 4cc6260684207865344f5b9a7065284d564d4e61 (patch) | |
| tree | 3a7257bf097a17f5e160c278713837ce23f9f5df /Documentation/git-commit.txt | |
| parent | d5a719e4afbfd74cf5ccf94c2a5b27aa5d06e914 (diff) | |
| download | git-4cc6260684207865344f5b9a7065284d564d4e61.tar.gz | |
Documentation: clarify -u<mode> option defaults
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-commit.txt')
| -rw-r--r-- | Documentation/git-commit.txt | 12 |
1 files changed, 6 insertions, 6 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:: |