From 7823a5120356ed655febe7c0378669baa0da1d4e Mon Sep 17 00:00:00 2001 From: Brian Lyles Date: Sat, 16 Mar 2024 00:01:24 -0500 Subject: [PATCH 1/2] docs: clarify file options in git-config `--edit` The description for the `-e`/`--edit` option references scopes inconsistently: system and global are referenced by their option name (`--system`/`--global`), but repository (`--local` is not. Additionally, neither `--worktree` nor `--file` are referenced at all, despite also being a valid options. Update the description to mention all four available scopes as well as `--file`, referencing each consistently by their option name. Signed-off-by: Brian Lyles Signed-off-by: Junio C Hamano --- Documentation/git-config.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index dff39093b5..6876803253 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -275,7 +275,8 @@ Valid ``'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 `. --[no-]includes:: Respect `include.*` directives in config files when looking up From 86f9ce7dd618c2b0773d5ef284f1177194add56e Mon Sep 17 00:00:00 2001 From: Brian Lyles Date: Sat, 16 Mar 2024 00:01:25 -0500 Subject: [PATCH 2/2] docs: fix typo in git-config `--default` Signed-off-by: Brian Lyles Signed-off-by: Junio C Hamano --- Documentation/git-config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index 6876803253..a6e82b871b 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -286,7 +286,7 @@ Valid ``'s include: --default :: When using `--get`, and the requested variable is not found, behave as if - were the value assigned to the that variable. + were the value assigned to that variable. CONFIGURATION -------------