Merge branch 'ma/config-doc-update'

Doc update.

* ma/config-doc-update:
  git-config.txt: fix 'see: above' note
  Doc: use `--type=bool` instead of `--bool`
This commit is contained in:
Junio C Hamano
2018-10-16 16:16:00 +09:00
3 changed files with 6 additions and 6 deletions

View File

@ -225,7 +225,7 @@ boolean::
false;; Boolean false literals are `no`, `off`, `false`, false;; Boolean false literals are `no`, `off`, `false`,
`0` and the empty string. `0` and the empty string.
+ +
When converting value to the canonical form using `--bool` type When converting a value to its canonical form using the `--type=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). "false" (spelled in lowercase).

View File

@ -188,8 +188,8 @@ Valid `<type>`'s include:
--bool-or-int:: --bool-or-int::
--path:: --path::
--expiry-date:: --expiry-date::
Historical options for selecting a type specifier. Prefer instead `--type`, Historical options for selecting a type specifier. Prefer instead `--type`
(see: above). (see above).
--no-type:: --no-type::
Un-sets the previously set type specifier (if one was previously set). This Un-sets the previously set type specifier (if one was previously set). This
@ -442,9 +442,9 @@ For URLs in `https://weak.example.com`, `http.sslVerify` is set to
false, while it is set to `true` for all others: false, while it is set to `true` for all others:
------------ ------------
% git config --bool --get-urlmatch http.sslverify https://good.example.com % git config --type=bool --get-urlmatch http.sslverify https://good.example.com
true true
% git config --bool --get-urlmatch http.sslverify https://weak.example.com % git config --type=bool --get-urlmatch http.sslverify https://weak.example.com
false false
% git config --get-urlmatch http https://weak.example.com % git config --get-urlmatch http https://weak.example.com
http.cookieFile /tmp/cookie.txt http.cookieFile /tmp/cookie.txt

View File

@ -76,7 +76,7 @@ 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 `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 config file). Including the equals but with an empty value (like `git -c
foo.bar= ...`) sets `foo.bar` to the empty string which `git config foo.bar= ...`) sets `foo.bar` to the empty string which `git config
--bool` will convert to `false`. --type=bool` will convert to `false`.
--exec-path[=<path>]:: --exec-path[=<path>]::
Path to wherever your core Git programs are installed. Path to wherever your core Git programs are installed.