diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-10-16 07:16:00 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-16 07:16:00 (GMT) |
| commit | 7a3335db9193e016cf0ca74dde6386f3127d0f7a (patch) | |
| tree | a32e32952d3fcd348b7202db4605ea3ae5e1812f | |
| parent | 73b9c6f58358c2d6167f7a51ac06eee2fab6f5d8 (diff) | |
| parent | 08caa95a27e8530156cc3b43bc7588dcc838fab8 (diff) | |
| download | git-7a3335db9193e016cf0ca74dde6386f3127d0f7a.zip git-7a3335db9193e016cf0ca74dde6386f3127d0f7a.tar.gz git-7a3335db9193e016cf0ca74dde6386f3127d0f7a.tar.bz2 | |
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`
| -rw-r--r-- | Documentation/config.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-config.txt | 8 | ||||
| -rw-r--r-- | Documentation/git.txt | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 1546833..c9f8b72 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -225,7 +225,7 @@ boolean:: false;; Boolean false literals are `no`, `off`, `false`, `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 "false" (spelled in lowercase). diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index 8e24043..5e87d82 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -188,8 +188,8 @@ Valid `<type>`'s include: --bool-or-int:: --path:: --expiry-date:: - Historical options for selecting a type specifier. Prefer instead `--type`, - (see: above). + Historical options for selecting a type specifier. Prefer instead `--type` + (see above). --no-type:: 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: ------------ -% git config --bool --get-urlmatch http.sslverify https://good.example.com +% git config --type=bool --get-urlmatch http.sslverify https://good.example.com 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 % git config --get-urlmatch http https://weak.example.com http.cookieFile /tmp/cookie.txt diff --git a/Documentation/git.txt b/Documentation/git.txt index 74a9d7e..08e533d 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -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 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 ---bool` will convert to `false`. +--type=bool` will convert to `false`. --exec-path[=<path>]:: Path to wherever your core Git programs are installed. |