summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2023-10-08 06:45:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2023-10-09 19:04:21 (GMT)
commitcf6cac20059123d6ec3f867bb3692df62db52cf9 (patch)
tree99e0ee363183782b239257d69d28282c44100136 /Documentation/config.txt
parent3a06386e314565108ad56a9bdb8f7b80ac52fb69 (diff)
downloadgit-cf6cac20059123d6ec3f867bb3692df62db52cf9.zip
git-cf6cac20059123d6ec3f867bb3692df62db52cf9.tar.gz
git-cf6cac20059123d6ec3f867bb3692df62db52cf9.tar.bz2
documentation: wording improvements
Diff best viewed with --color-diff. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 229b63a..9273c7f 100644
--- a/Documentation/config.txt
+++ b/Documentation/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 a
`includeIf.<condition>.path` variable to the name of the file to be
included.