aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-02-11 09:20:07 -0800
committerJunio C Hamano <gitster@pobox.com>2025-02-11 10:12:04 -0800
commit832f56f06a5910b2f41a2e0dd8b382b6c709de07 (patch)
tree9d49593006b1592ed47b59e97c0060fcbfb8b077
parent5c21db3a0d5f4414b65e114ca21c5a1fe736f2bc (diff)
downloadgit-832f56f06a5910b2f41a2e0dd8b382b6c709de07.tar.gz
doc: centrally document various ways tospell `true` and `false`
We do not seem to centrally document exhaustively ways to spell Boolean values. The description in the Environment Variables of git(1) section assumes that the reader is already familiar with how "Boolean valued configuration variables" are specified, without referring to anything, so there is no way for the readers to find out more. The description of `bool` in the section on "--type <type>" in "git config --help" might be the place to do so, but it is not telling us all that much. The description of Boolean valued placeholders in the pretty formats section of "git log --help" enumerates the possible values with "etc." implying there may be other synonyms; shrink the list of samples and instead refer to the canonical and authoritative source of truth, which now is git-config(1). Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-config.txt4
-rw-r--r--Documentation/git.txt5
-rw-r--r--Documentation/pretty-formats.txt8
3 files changed, 10 insertions, 7 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 7f81fbbea8..e904c074bf 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -213,7 +213,9 @@ See also <<FILES>>.
+
Valid `<type>`'s include:
+
-- 'bool': canonicalize values as either "true" or "false".
+- 'bool': canonicalize values `true`, `yes`,`on`, and positive
+ numbers as "true", and values `false`, `no`, `off` and `0` as
+ "false".
- 'int': canonicalize values as simple decimal numbers. An optional suffix of
'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or
1073741824 upon input.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 4489e2297a..57295c0413 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -472,8 +472,9 @@ Environment Variables
---------------------
Various Git commands pay attention to environment variables and change
their behavior. The environment variables marked as "Boolean" take
-their values the same way as Boolean valued configuration variables, e.g.
-"true", "yes", "on" and positive numbers are taken as "yes".
+their values the same way as Boolean valued configuration variables, i.e.,
+"true", "yes", "on" and positive numbers are taken as "yes", while "false",
+"no", "off", and "0" are taken as "no".
Here are the variables:
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 8ee940b6a4..07475de8c3 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -339,10 +339,10 @@ insert an empty string unless we are traversing reflog entries (e.g., by
decoration format if `--decorate` was not already provided on the command
line.
-The boolean options accept an optional value `[=<bool-value>]`. The values
-`true`, `false`, `on`, `off` etc. are all accepted. See the "boolean"
-sub-section in "EXAMPLES" in linkgit:git-config[1]. If a boolean
-option is given with no value, it's enabled.
+The boolean options accept an optional value `[=<bool-value>]`. The
+values taken by `--type=bool` git-config[1], like `yes` and `off`,
+are all accepted. Giving a boolean option without `=<value>` is
+equivalent to giving it with `=true`.
If you add a `+` (plus sign) after '%' of a placeholder, a line-feed
is inserted immediately before the expansion if and only if the