# [PATCH 1/2] docs: clarify file options in git-config `--edit` 4 messages from 2024-03-16 to 2024-03-21. Participants: Brian Lyles, Patrick Steinhardt, Junio C Hamano. Thread: https://gitlist.dev/t/61131 ## Brian Lyles, 2024-03-16 05:01 Subject: [PATCH 1/2] docs: clarify file options in git-config `--edit` Message-ID: <20240316050149.1182867-1-brianmlyles@gmail.com> URL: https://gitlist.dev/e/20240316050149.1182867-1-brianmlyles%40gmail.com ``` 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 --- 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 -- 2.43.0 ``` ## Brian Lyles, 2024-03-16 05:01 Subject: [PATCH 2/2] docs: fix typo in git-config `--default` Message-ID: <20240316050149.1182867-2-brianmlyles@gmail.com> URL: https://gitlist.dev/e/20240316050149.1182867-2-brianmlyles%40gmail.com In-Reply-To: <20240316050149.1182867-1-brianmlyles@gmail.com> ``` Signed-off-by: Brian Lyles --- 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 ------------- -- 2.43.0 ``` ## Patrick Steinhardt, 2024-03-21 10:00 Subject: Re: [PATCH 1/2] docs: clarify file options in git-config `--edit` Message-ID: URL: https://gitlist.dev/e/ZfwFKyE-eOJo0zl4%40tanuki In-Reply-To: <20240316050149.1182867-1-brianmlyles@gmail.com> ``` On Sat, Mar 16, 2024 at 12:01:24AM -0500, Brian Lyles wrote: > 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 I know that this series has been merged to `next` already, but as it didn't get any on-list review I just wanted to mention that this series looks good to me. Patrick > --- > 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 > -- > 2.43.0 > > ``` ## Junio C Hamano, 2024-03-21 16:23 Subject: Re: [PATCH 1/2] docs: clarify file options in git-config `--edit` Message-ID: URL: https://gitlist.dev/e/xmqqcyrnbll8.fsf%40gitster.g In-Reply-To: ``` Patrick Steinhardt writes: > On Sat, Mar 16, 2024 at 12:01:24AM -0500, Brian Lyles wrote: >> 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 > > I know that this series has been merged to `next` already, but as it > didn't get any on-list review I just wanted to mention that this series > looks good to me. > > Patrick Yeah, thanks, both of you. > >> --- >> 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 >> -- >> 2.43.0 >> >> ```