aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-config.adoc
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-08-25 14:22:01 -0700
committerJunio C Hamano <gitster@pobox.com>2025-08-25 14:22:02 -0700
commit0d8f4ccfe3b13bb5eb95f030dc5fe76efb255397 (patch)
treed7c7205b2ae9788e006996be6f8074978f215507 /Documentation/git-config.adoc
parent109c3df14ccf372c2438a470bdfb566265399f0a (diff)
parent84f3d6e11e085a52e561a509f2433208f22c6d3b (diff)
downloadgit-0d8f4ccfe3b13bb5eb95f030dc5fe76efb255397.tar.xz
Merge branch 'ja/doc-lint-sections-and-synopsis'
Doc lint updates to encourage the newer and easier-to-use `synopsis` format, with fixes to a handful of existing uses. * ja/doc-lint-sections-and-synopsis: doc lint: check that synopsis manpages have synopsis inlines doc:git-for-each-ref: fix styling and typos doc: check for absence of the form --[no-]parameter doc: check for absence of multiple terms in each entry of desc list doc: check well-formedness of delimited sections doc: test linkgit macros for well-formedness
Diffstat (limited to 'Documentation/git-config.adoc')
-rw-r--r--Documentation/git-config.adoc3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-config.adoc b/Documentation/git-config.adoc
index 511b2e26bf..36d2845152 100644
--- a/Documentation/git-config.adoc
+++ b/Documentation/git-config.adoc
@@ -295,7 +295,8 @@ Valid `<type>`'s include:
When the color setting for `name` is undefined, the command uses
`color.ui` as fallback.
---[no-]includes::
+--includes::
+--no-includes::
Respect `include.*` directives in config files when looking up
values. Defaults to `off` when a specific file is given (e.g.,
using `--file`, `--global`, etc) and `on` when searching all