summaryrefslogtreecommitdiffstats
path: root/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-10-23 14:45:54 -0700
committerJunio C Hamano <gitster@pobox.com>2023-10-23 14:45:54 -0700
commit33be82183d4cd6dc645f64da1402cf9a3f4cdbf3 (patch)
tree4a681cad5c6da23a7d7f56022666fb31397026d2 /config.txt
parent359f02427091f2c0fcac4eb7651fe5d159b84a54 (diff)
downloadgit-htmldocs-33be82183d4cd6dc645f64da1402cf9a3f4cdbf3.tar.gz
Autogenerated HTML docs for v2.42.0-482-g2e8e7
Diffstat (limited to 'config.txt')
-rw-r--r--config.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/config.txt b/config.txt
index 229b63a45..b1dba1ae8 100644
--- a/config.txt
+++ b/config.txt
@@ -11,7 +11,7 @@ file. The file `/etc/gitconfig` can be used to store a system-wide
default configuration.
The configuration variables are used by both the Git plumbing
-and the porcelains. The variables are divided into sections, wherein
+and the porcelain commands. The variables are divided into sections, wherein
the fully qualified variable name of the variable itself is the last
dot-separated segment and the section name is everything before the last
dot. The variable names are case-insensitive, allow only alphanumeric
@@ -103,7 +103,7 @@ was found. See below for examples.
Conditional includes
~~~~~~~~~~~~~~~~~~~~
-You can include a config file from another conditionally by setting a
+You can conditionally include a config file from another by setting an
`includeIf.<condition>.path` variable to the name of the file to be
included.
@@ -118,7 +118,7 @@ are:
pattern, the include condition is met.
+
The .git location may be auto-discovered, or come from `$GIT_DIR`
-environment variable. If the repository is auto discovered via a .git
+environment variable. If the repository is auto-discovered via a .git
file (e.g. from submodules, or a linked worktree), the .git location
would be the final location where the .git directory is, not where the
.git file is.