diff options
author | Elijah Newren <newren@gmail.com> | 2023-10-08 06:45:09 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 12:06:29 -0700 |
commit | ce14cc0b00098201f967346955804abd774174ea (patch) | |
tree | 87da2bbac39b08973b8a5e3944ddf7a21141a392 /Documentation/config | |
parent | 859a6d6045e338a337cb7499100b1fa31c367fbf (diff) | |
download | git-ce14cc0b00098201f967346955804abd774174ea.tar.gz |
documentation: fix subject/verb agreement
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')
-rw-r--r-- | Documentation/config/advice.txt | 2 | ||||
-rw-r--r-- | Documentation/config/alias.txt | 2 | ||||
-rw-r--r-- | Documentation/config/fsck.txt | 2 | ||||
-rw-r--r-- | Documentation/config/gpg.txt | 2 | ||||
-rw-r--r-- | Documentation/config/maintenance.txt | 2 | ||||
-rw-r--r-- | Documentation/config/status.txt | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt index f4864a2d58..f524af4e89 100644 --- a/Documentation/config/advice.txt +++ b/Documentation/config/advice.txt @@ -5,7 +5,7 @@ advice.*:: + -- ambiguousFetchRefspec:: - Advice shown when fetch refspec for multiple remotes map to + Advice shown when fetch refspec for multiple remotes maps to the same remote-tracking branch namespace and causes branch tracking set-up to fail. fetchShowForcedUpdates:: diff --git a/Documentation/config/alias.txt b/Documentation/config/alias.txt index f1ca739d57..01df96fab3 100644 --- a/Documentation/config/alias.txt +++ b/Documentation/config/alias.txt @@ -4,7 +4,7 @@ alias.*:: `git last` is equivalent to `git cat-file commit HEAD`. To avoid confusion and troubles with script usage, aliases that hide existing Git commands are ignored. Arguments are split by - spaces, the usual shell quoting and escaping is supported. + spaces, the usual shell quoting and escaping are supported. A quote pair or a backslash can be used to quote them. + Note that the first word of an alias does not necessarily have to be a diff --git a/Documentation/config/fsck.txt b/Documentation/config/fsck.txt index 9b16757553..0687e86ba1 100644 --- a/Documentation/config/fsck.txt +++ b/Documentation/config/fsck.txt @@ -44,7 +44,7 @@ fsck.skipList:: The path to a list of object names (i.e. one unabbreviated SHA-1 per line) that are known to be broken in a non-fatal way and should be ignored. On versions of Git 2.20 and later comments ('#'), empty - lines, and any leading and trailing whitespace is ignored. Everything + lines, and any leading and trailing whitespace are ignored. Everything but a SHA-1 per line will error out on older versions. + This feature is useful when an established project should be accepted diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt index 248d99d70b..5cf32b179d 100644 --- a/Documentation/config/gpg.txt +++ b/Documentation/config/gpg.txt @@ -25,7 +25,7 @@ gpg.<format>.program:: gpg.minTrustLevel:: Specifies a minimum trust level for signature verification. If this option is unset, then signature verification for merge - operations require a key with at least `marginal` trust. Other + operations requires a key with at least `marginal` trust. Other operations that perform signature verification require a key with at least `undefined` trust. Setting this option overrides the required trust-level for all operations. Supported values, diff --git a/Documentation/config/maintenance.txt b/Documentation/config/maintenance.txt index 18f0562131..69a4f05153 100644 --- a/Documentation/config/maintenance.txt +++ b/Documentation/config/maintenance.txt @@ -12,7 +12,7 @@ maintenance.strategy:: then that value is used instead of the one provided by `maintenance.strategy`. The possible strategy strings are: + -* `none`: This default setting implies no task are run at any schedule. +* `none`: This default setting implies no tasks are run at any schedule. * `incremental`: This setting optimizes for performing small maintenance activities that do not delete any data. This does not schedule the `gc` task, but runs the `prefetch` and `commit-graph` tasks hourly, the diff --git a/Documentation/config/status.txt b/Documentation/config/status.txt index 0fc704ab80..f0336938cb 100644 --- a/Documentation/config/status.txt +++ b/Documentation/config/status.txt @@ -47,7 +47,7 @@ status.showUntrackedFiles:: contain only untracked files, are shown with the directory name only. Showing untracked files means that Git needs to lstat() all the files in the whole repository, which might be slow on some - systems. So, this variable controls how the commands displays + systems. So, this variable controls how the commands display the untracked files. Possible values are: + -- |