diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-03-28 21:13:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-28 21:13:50 (GMT) |
| commit | bf0a35206910c67e840b5c5272cfe03a266b4eba (patch) | |
| tree | d3c2bd83627f9fc876c2ea384721618fe589899c /Documentation | |
| parent | 396430b5a73f60acc2ce8365a9edfe6923014ca3 (diff) | |
| parent | f66e1a071bd66e64160d9e73428d6cd7bdcff84e (diff) | |
| download | git-bf0a35206910c67e840b5c5272cfe03a266b4eba.zip git-bf0a35206910c67e840b5c5272cfe03a266b4eba.tar.gz git-bf0a35206910c67e840b5c5272cfe03a266b4eba.tar.bz2 | |
Merge branch 'jc/show-untracked-false'
The status.showUntrackedFiles configuration variable had a name
that tempts users to set a Boolean value expressed in our usual
"false", "off", and "0", but it only took "no". This has been
corrected so "true" and its synonyms are taken as "normal", while
"false" and its synonyms are taken as "no".
* jc/show-untracked-false:
status: allow --untracked=false and friends
status: unify parsing of --untracked= and status.showUntrackedFiles
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config/status.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-commit.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-status.txt | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config/status.txt b/Documentation/config/status.txt index 2ff8237..8caf90f 100644 --- a/Documentation/config/status.txt +++ b/Documentation/config/status.txt @@ -57,6 +57,8 @@ status.showUntrackedFiles:: -- + If this variable is not specified, it defaults to 'normal'. +All usual spellings for Boolean value `true` are taken as `normal` +and `false` as `no`. This variable can be overridden with the -u|--untracked-files option of linkgit:git-status[1] and linkgit:git-commit[1]. diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index a6cef5d..89ecfc6 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -347,6 +347,8 @@ The possible options are: - 'normal' - Shows untracked files and directories - 'all' - Also shows individual files in untracked directories. +All usual spellings for Boolean value `true` are taken as `normal` +and `false` as `no`. The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]. -- diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index b0f36fa..9a37688 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -79,6 +79,8 @@ Consider enabling untracked cache and split index if supported (see `git update-index --untracked-cache` and `git update-index --split-index`), Otherwise you can use `no` to have `git status` return more quickly without showing untracked files. +All usual spellings for Boolean value `true` are taken as `normal` +and `false` as `no`. The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]. |