diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-09-13 15:26:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-09-13 15:26:52 -0700 |
| commit | 8b4bb65a8fc4864525c9c9b1752cde1ca3d6ac63 (patch) | |
| tree | 0b45c7c42fd16e7406c2d181b47e67798c49e780 | |
| parent | d3d7c8dfb810c44b6f6046134bdbc42110b7bc47 (diff) | |
| parent | 160947040917c340633f79c6f44d3cae4653d53a (diff) | |
Merge branch 'jc/config-doc-update' into maint-2.46
Docfix.
* jc/config-doc-update:
git-config.1: fix description of --regexp in synopsis
git-config.1: --get-all description update
| -rw-r--r-- | Documentation/git-config.txt | 4 | ||||
| -rw-r--r-- | builtin/config.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index 79360328aa..7f81fbbea8 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git config list' [<file-option>] [<display-option>] [--includes] -'git config get' [<file-option>] [<display-option>] [--includes] [--all] [--regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] <name> +'git config get' [<file-option>] [<display-option>] [--includes] [--all] [--regexp] [--value=<value>] [--fixed-value] [--default=<default>] <name> 'git config set' [<file-option>] [--type=<type>] [--all] [--value=<value>] [--fixed-value] <name> <value> 'git config unset' [<file-option>] [--all] [--value=<value>] [--fixed-value] <name> <value> 'git config rename-section' [<file-option>] <old-name> <new-name> @@ -309,7 +309,7 @@ recommended to migrate to the new syntax. Replaced by `git config get [--value=<pattern>] <name>`. --get-all <name> [<value-pattern>]:: - Replaced by `git config get [--value=<pattern>] --all --show-names <name>`. + Replaced by `git config get [--value=<pattern>] --all <name>`. --get-regexp <name-regexp>:: Replaced by `git config get --all --show-names --regexp <name-regexp>`. diff --git a/builtin/config.c b/builtin/config.c index 20a0b64090..97e4d5f57c 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -17,7 +17,7 @@ static const char *const builtin_config_usage[] = { N_("git config list [<file-option>] [<display-option>] [--includes]"), - N_("git config get [<file-option>] [<display-option>] [--includes] [--all] [--regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] <name>"), + N_("git config get [<file-option>] [<display-option>] [--includes] [--all] [--regexp] [--value=<value>] [--fixed-value] [--default=<default>] <name>"), N_("git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--fixed-value] <name> <value>"), N_("git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] <name> <value>"), N_("git config rename-section [<file-option>] <old-name> <new-name>"), |