Skip to content

Commit cf6cac2

Browse files
newrengitster
authored andcommitted
documentation: wording improvements
Diff best viewed with --color-diff. Signed-off-by: Elijah Newren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 3a06386 commit cf6cac2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+134
-133
lines changed

Documentation/CodingGuidelines

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Like other projects, we also have some guidelines to keep to the
2-
code. For Git in general, a few rough rules are:
1+
Like other projects, we also have some guidelines for our code. For
2+
Git in general, a few rough rules are:
33

44
- Most importantly, we never say "It's in POSIX; we'll happily
55
ignore your needs should your system not conform to it."

Documentation/ToolsForGit.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ information on using the script.
3232

3333
This is adapted from Linux's suggestion in its CodingStyle document:
3434

35-
- To follow rules of the CodingGuideline, it's useful to put the following in
35+
- To follow the rules in CodingGuidelines, it's useful to put the following in
3636
GIT_CHECKOUT/.dir-locals.el, assuming you use cperl-mode:
3737
----
3838
;; note the first part is useful for C editing, too

Documentation/config.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ file. The file `/etc/gitconfig` can be used to store a system-wide
1111
default configuration.
1212

1313
The configuration variables are used by both the Git plumbing
14-
and the porcelains. The variables are divided into sections, wherein
14+
and the porcelain commands. The variables are divided into sections, wherein
1515
the fully qualified variable name of the variable itself is the last
1616
dot-separated segment and the section name is everything before the last
1717
dot. The variable names are case-insensitive, allow only alphanumeric
@@ -103,7 +103,7 @@ was found. See below for examples.
103103
Conditional includes
104104
~~~~~~~~~~~~~~~~~~~~
105105

106-
You can include a config file from another conditionally by setting a
106+
You can conditionally include a config file from another by setting a
107107
`includeIf.<condition>.path` variable to the name of the file to be
108108
included.
109109

Documentation/config/apply.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply.ignoreWhitespace::
22
When set to 'change', tells 'git apply' to ignore changes in
33
whitespace, in the same way as the `--ignore-space-change`
44
option.
5-
When set to one of: no, none, never, false tells 'git apply' to
5+
When set to one of: no, none, never, false, it tells 'git apply' to
66
respect all whitespace differences.
77
See linkgit:git-apply[1].
88

Documentation/config/branch.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ branch.sort::
3636

3737
branch.<name>.remote::
3838
When on branch <name>, it tells 'git fetch' and 'git push'
39-
which remote to fetch from/push to. The remote to push to
39+
which remote to fetch from or push to. The remote to push to
4040
may be overridden with `remote.pushDefault` (for all branches).
4141
The remote to push to, for the current branch, may be further
4242
overridden by `branch.<name>.pushRemote`. If no remote is

Documentation/config/clone.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ clone.defaultRemoteName::
44
option to linkgit:git-clone[1].
55

66
clone.rejectShallow::
7-
Reject to clone a repository if it is a shallow one, can be overridden by
8-
passing option `--reject-shallow` in command line. See linkgit:git-clone[1]
7+
Reject to clone a repository if it is a shallow one; this can be overridden by
8+
passing the `--reject-shallow` option on the command line. See linkgit:git-clone[1]
99

1010
clone.filterSubmodules::
1111
If a partial clone filter is provided (see `--filter` in

Documentation/config/credential.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ credentialCache.ignoreSIGHUP::
3131

3232
credentialStore.lockTimeoutMS::
3333
The length of time, in milliseconds, for git-credential-store to retry
34-
when trying to lock the credentials file. Value 0 means not to retry at
34+
when trying to lock the credentials file. A value of 0 means not to retry at
3535
all; -1 means to try indefinitely. Default is 1000 (i.e., retry for
3636
1s).

Documentation/config/fetch.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ fetch.pruneTags::
5252

5353
fetch.output::
5454
Control how ref update status is printed. Valid values are
55-
`full` and `compact`. Default value is `full`. See section
56-
OUTPUT in linkgit:git-fetch[1] for detail.
55+
`full` and `compact`. Default value is `full`. See the
56+
OUTPUT section in linkgit:git-fetch[1] for detail.
5757

5858
fetch.negotiationAlgorithm::
5959
Control how information about the commits in the local repository

Documentation/config/fsck.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Unlike variables like `color.ui` and `core.editor` the
1717
`receive.fsck.<msg-id>` and `fetch.fsck.<msg-id>` variables will not
1818
fall back on the `fsck.<msg-id>` configuration if they aren't set. To
1919
uniformly configure the same fsck settings in different circumstances
20-
all three of them they must all set to the same values.
20+
all three of them must be set to the same values.
2121
+
2222
When `fsck.<msg-id>` is set, errors can be switched to warnings and
2323
vice versa by configuring the `fsck.<msg-id>` setting where the
@@ -59,7 +59,7 @@ Unlike variables like `color.ui` and `core.editor` the
5959
`receive.fsck.skipList` and `fetch.fsck.skipList` variables will not
6060
fall back on the `fsck.skipList` configuration if they aren't set. To
6161
uniformly configure the same fsck settings in different circumstances
62-
all three of them they must all set to the same values.
62+
all three of them must be set to the same values.
6363
+
6464
Older versions of Git (before 2.20) documented that the object names
6565
list should be sorted. This was never a requirement, the object names

Documentation/config/fsmonitor--daemon.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
fsmonitor.allowRemote::
2-
By default, the fsmonitor daemon refuses to work against network-mounted
2+
By default, the fsmonitor daemon refuses to work with network-mounted
33
repositories. Setting `fsmonitor.allowRemote` to `true` overrides this
44
behavior. Only respected when `core.fsmonitor` is set to `true`.
55

0 commit comments

Comments
 (0)