Skip to content

Commit dbe33c5

Browse files
newrengitster
authored andcommitted
documentation: fix apostrophe usage
Diff best viewed with --color-diff. Signed-off-by: Elijah Newren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 384f7d1 commit dbe33c5

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

Documentation/config/index.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ index.threads::
2323
Specifies the number of threads to spawn when loading the index.
2424
This is meant to reduce index load time on multiprocessor machines.
2525
Specifying 0 or 'true' will cause Git to auto-detect the number of
26-
CPU's and set the number of threads accordingly. Specifying 1 or
26+
CPUs and set the number of threads accordingly. Specifying 1 or
2727
'false' will disable multithreading. Defaults to 'true'.
2828

2929
index.version::

Documentation/config/pack.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ pack.threads::
7474
warning. This is meant to reduce packing time on multiprocessor
7575
machines. The required amount of memory for the delta search window
7676
is however multiplied by the number of threads.
77-
Specifying 0 will cause Git to auto-detect the number of CPU's
77+
Specifying 0 will cause Git to auto-detect the number of CPUs
7878
and set the number of threads accordingly.
7979

8080
pack.indexVersion::

Documentation/config/submodule.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ submodule.<name>.ignore::
3535
a submodule as modified. When set to "all", it will never be considered
3636
modified (but it will nonetheless show up in the output of status and
3737
commit when it has been staged), "dirty" will ignore all changes
38-
to the submodules work tree and
38+
to the submodule's work tree and
3939
takes only differences between the HEAD of the submodule and the commit
4040
recorded in the superproject into account. "untracked" will additionally
4141
let submodules with modified tracked files in their work tree show up.

Documentation/git-mktag.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ SYNOPSIS
1414
DESCRIPTION
1515
-----------
1616

17-
Reads a tag contents on standard input and creates a tag object. The
17+
Reads a tag's contents on standard input and creates a tag object. The
1818
output is the new tag's <object> identifier.
1919

2020
This command is mostly equivalent to linkgit:git-hash-object[1]

Documentation/git-rm.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ will be staged (unless --cached or -n are used).
163163

164164
A submodule is considered up to date when the HEAD is the same as
165165
recorded in the index, no tracked files are modified and no untracked
166-
files that aren't ignored are present in the submodules work tree.
166+
files that aren't ignored are present in the submodule's work tree.
167167
Ignored files are deemed expendable and won't stop a submodule's work
168168
tree from being removed.
169169

Documentation/gitprotocol-pack.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ an absolute path in the remote filesystem.
137137
v
138138
ssh [email protected] "git-upload-pack '/project.git'"
139139

140-
In a "user@host:path" format URI, its relative to the user's home
140+
In a "user@host:path" format URI, it's relative to the user's home
141141
directory, because the Git client will run:
142142

143143
git clone [email protected]:project.git

Documentation/pull-fetch-param.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ refspec (or `--force`).
7171
Unlike when pushing with linkgit:git-push[1], any updates outside of
7272
`refs/{tags,heads}/*` will be accepted without `+` in the refspec (or
7373
`--force`), whether that's swapping e.g. a tree object for a blob, or
74-
a commit for another commit that's doesn't have the previous commit as
74+
a commit for another commit that doesn't have the previous commit as
7575
an ancestor etc.
7676
+
7777
Unlike when pushing with linkgit:git-push[1], there is no

Documentation/technical/rerere.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ examples would both result in the following normalized conflict:
7676
Sorting hunks
7777
~~~~~~~~~~~~~
7878

79-
As before, lets imagine that a common ancestor had a file with line A
79+
As before, let's imagine that a common ancestor had a file with line A
8080
its early part, and line X in its late part. And then four branches
8181
are forked that do these things:
8282

0 commit comments

Comments
 (0)