From: Junio C Hamano Date: Wed, 23 Aug 2017 21:13:08 +0000 (-0700) Subject: Merge branch 'ah/doc-empty-string-is-false' X-Git-Tag: v2.15.0-rc0~150 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/76be4487f08d40bd1dba0d5b0dcbd2513ca26e8c?hp=ad7d3c3b391b73207fbb29da99d4f64ad0c54f00 Merge branch 'ah/doc-empty-string-is-false' Doc update. * ah/doc-empty-string-is-false: doc: clarify "config --bool" behaviour with empty string --- diff --git a/Documentation/config.txt b/Documentation/config.txt index d5c9c4cab6..478b9431e0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -216,15 +216,15 @@ boolean:: synonyms are accepted for 'true' and 'false'; these are all case-insensitive. - true;; Boolean true can be spelled as `yes`, `on`, `true`, - or `1`. Also, a variable defined without `= ` + true;; Boolean true literals are `yes`, `on`, `true`, + and `1`. Also, a variable defined without `= ` is taken as true. - false;; Boolean false can be spelled as `no`, `off`, - `false`, or `0`. + false;; Boolean false literals are `no`, `off`, `false`, + `0` and the empty string. + When converting value to the canonical form using `--bool` type -specifier; 'git config' will ensure that the output is "true" or +specifier, 'git config' will ensure that the output is "true" or "false" (spelled in lowercase). integer:: diff --git a/Documentation/git.txt b/Documentation/git.txt index 7dd5e03280..6e3a6767e5 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -75,7 +75,8 @@ example the following invocations are equivalent: Note that omitting the `=` in `git -c foo.bar ...` is allowed and sets `foo.bar` to the boolean true value (just like `[foo]bar` would in a config file). Including the equals but with an empty value (like `git -c -foo.bar= ...`) sets `foo.bar` to the empty string. +foo.bar= ...`) sets `foo.bar` to the empty string which ` git config +--bool` will convert to `false`. --exec-path[=]:: Path to wherever your core Git programs are installed.