Merge branch 'jc/doc-includeif-hasconfig-remote-url-fix'
Doc mark-up fix. * jc/doc-includeif-hasconfig-remote-url-fix: config: document includeIf conditions consistentlymain
commit
d680fe4996
|
@ -114,8 +114,7 @@ whose format and meaning depends on the keyword. Supported keywords
|
||||||
are:
|
are:
|
||||||
|
|
||||||
`gitdir`::
|
`gitdir`::
|
||||||
|
The data that follows the keyword `gitdir` and a colon is used as a glob
|
||||||
The data that follows the keyword `gitdir:` is used as a glob
|
|
||||||
pattern. If the location of the .git directory matches the
|
pattern. If the location of the .git directory matches the
|
||||||
pattern, the include condition is met.
|
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)
|
case-insensitively (e.g. on case-insensitive file systems)
|
||||||
|
|
||||||
`onbranch`::
|
`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
|
pattern with standard globbing wildcards and two additional
|
||||||
ones, `**/` and `/**`, that can match multiple path components.
|
ones, `**/` and `/**`, that can match multiple path components.
|
||||||
If we are in a worktree where the name of the branch that is
|
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
|
organized hierarchically and you would like to apply a configuration to
|
||||||
all the branches in that hierarchy.
|
all the branches in that hierarchy.
|
||||||
|
|
||||||
`hasconfig:remote.*.url:`::
|
`hasconfig:remote.*.url`::
|
||||||
The data that follows this keyword is taken to
|
The data that follows this keyword and a colon is taken to
|
||||||
be a pattern with standard globbing wildcards and two
|
be a pattern with standard globbing wildcards and two
|
||||||
additional ones, `**/` and `/**`, that can match multiple
|
additional ones, `**/` and `/**`, that can match multiple
|
||||||
components. The first time this keyword is seen, the rest of
|
components. The first time this keyword is seen, the rest of
|
||||||
|
|
Loading…
Reference in New Issue