aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-03-25 16:16:35 -0700
committerJunio C Hamano <gitster@pobox.com>2024-03-25 16:16:35 -0700
commitb58cc6aa5d575cc7b166986ef7cf800b49f584fa (patch)
treee50fbe2a20d46e080c561bc532751fa90aa299b6
parent0cb25d17445f848df13b971cb866c63c8f273b01 (diff)
parent86f9ce7dd618c2b0773d5ef284f1177194add56e (diff)
downloadgit-b58cc6aa5d575cc7b166986ef7cf800b49f584fa.tar.gz
Merge branch 'bl/doc-config-fixes'
A few typoes in "git config --help" have been corrected. * bl/doc-config-fixes: docs: fix typo in git-config `--default` docs: clarify file options in git-config `--edit`
-rw-r--r--Documentation/git-config.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index dff39093b5..a6e82b871b 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -275,7 +275,8 @@ Valid `<type>`'s include:
-e::
--edit::
Opens an editor to modify the specified config file; either
- `--system`, `--global`, or repository (default).
+ `--system`, `--global`, `--local` (default), `--worktree`, or
+ `--file <config-file>`.
--[no-]includes::
Respect `include.*` directives in config files when looking up
@@ -285,7 +286,7 @@ Valid `<type>`'s include:
--default <value>::
When using `--get`, and the requested variable is not found, behave as if
- <value> were the value assigned to the that variable.
+ <value> were the value assigned to that variable.
CONFIGURATION
-------------