diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-10-15 10:29:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-15 10:29:34 -0700 |
| commit | e0a4669e56d2c3f247396b91d05fbb6ac267437d (patch) | |
| tree | c7837b6cbaa3af19761196ace857b68704ca72f7 | |
| parent | Merge branch 'mm/worktree-doc-typofix' into maint-2.51 (diff) | |
| parent | config: document includeIf conditions consistently (diff) | |
| download | git-e0a4669e56d2c3f247396b91d05fbb6ac267437d.tar.gz git-e0a4669e56d2c3f247396b91d05fbb6ac267437d.zip | |
Merge branch 'jc/doc-includeif-hasconfig-remote-url-fix' into maint-2.51
Doc mark-up fix.
* jc/doc-includeif-hasconfig-remote-url-fix:
config: document includeIf conditions consistently
| -rw-r--r-- | Documentation/config.adoc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Documentation/config.adoc b/Documentation/config.adoc index cc769251be..05f1ca7293 100644 --- a/Documentation/config.adoc +++ b/Documentation/config.adoc @@ -114,8 +114,7 @@ whose format and meaning depends on the keyword. Supported keywords are: `gitdir`:: - - The data that follows the keyword `gitdir:` is used as a glob + The data that follows the keyword `gitdir` and a colon is used as a glob pattern. If the location of the .git directory matches the pattern, the include condition is met. + @@ -148,7 +147,7 @@ refer to linkgit:gitignore[5] for details. For convenience: case-insensitively (e.g. on case-insensitive file systems) `onbranch`:: - The data that follows the keyword `onbranch:` is taken to be a + The data that follows the keyword `onbranch` and a colon is taken to be a pattern with standard globbing wildcards and two additional ones, `**/` and `/**`, that can match multiple path components. If we are in a worktree where the name of the branch that is @@ -161,8 +160,8 @@ all branches that begin with `foo/`. This is useful if your branches are organized hierarchically and you would like to apply a configuration to all the branches in that hierarchy. -`hasconfig:remote.*.url:`:: - The data that follows this keyword is taken to +`hasconfig:remote.*.url`:: + The data that follows this keyword and a colon is taken to be a pattern with standard globbing wildcards and two additional ones, `**/` and `/**`, that can match multiple components. The first time this keyword is seen, the rest of |