Skip to content

Commit 384f7d1

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

9 files changed

+11
-11
lines changed

Documentation/fsck-msgids.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
(FATAL) Missing end-of-line in the object header.
175175

176176
`zeroPaddedDate`::
177-
(ERROR) Found a zero padded date in an author/commiter line.
177+
(ERROR) Found a zero padded date in an author/committer line.
178178

179179
`zeroPaddedFilemode`::
180180
(WARN) Found a zero padded filemode in a tree.

Documentation/git-get-tar-commit-id.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ and extract the commit ID stored in it. It reads only the first
2020
1024 bytes of input, thus its runtime is not influenced by the size
2121
of the tar archive very much.
2222

23-
If no commit ID is found, 'git get-tar-commit-id' quietly exists with a
23+
If no commit ID is found, 'git get-tar-commit-id' quietly exits with a
2424
return code of 1. This can happen if the archive had not been created
2525
using 'git archive' or if the first parameter of 'git archive' had been
2626
a tree ID instead of a commit ID or tag.

Documentation/git-grep.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ The `--threads` option (and the grep.threads configuration) will be ignored when
337337

338338
When grepping the object store (with `--cached` or giving tree objects), running
339339
with multiple threads might perform slower than single threaded if `--textconv`
340-
is given and there're too many text conversions. So if you experience low
340+
is given and there are too many text conversions. So if you experience low
341341
performance in this case, it might be desirable to use `--threads=1`.
342342

343343
CONFIGURATION

Documentation/git-upload-pack.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ OPTIONS
2626
-------
2727

2828
--[no-]strict::
29-
Do not try <directory>/.git/ if <directory> is no Git directory.
29+
Do not try <directory>/.git/ if <directory> is not a Git directory.
3030

3131
--timeout=<n>::
3232
Interrupt transfer after <n> seconds of inactivity.

Documentation/gitformat-chunk.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Each row consists of a 4-byte chunk identifier (ID) and an 8-byte offset.
4242
Each integer is stored in network-byte order.
4343

4444
The chunk identifier `ID[i]` is a label for the data stored within this
45-
fill from `OFFSET[i]` (inclusive) to `OFFSET[i+1]` (exclusive). Thus, the
45+
file from `OFFSET[i]` (inclusive) to `OFFSET[i+1]` (exclusive). Thus, the
4646
size of the `i`th chunk is equal to the difference between `OFFSET[i+1]`
4747
and `OFFSET[i]`. This requires that the chunk data appears contiguously
4848
in the same order as the table of contents.

Documentation/gitformat-pack.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ $GIT_DIR/objects/pack/multi-pack-index
1717
DESCRIPTION
1818
-----------
1919

20-
The Git pack format is now Git stores most of its primary repository
21-
data. Over the lietime af a repository loose objects (if any) and
20+
The Git pack format is how Git stores most of its primary repository
21+
data. Over the lifetime of a repository loose objects (if any) and
2222
smaller packs are consolidated into larger pack(s). See
2323
linkgit:git-gc[1] and linkgit:git-pack-objects[1].
2424

Documentation/gitprotocol-capabilities.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ request include-tag only has to do with the client's desires for tag
273273
data, whether or not a server had advertised objects in the
274274
refs/tags/* namespace.
275275

276-
Servers MUST pack the tags if their referrant is packed and the client
276+
Servers MUST pack the tags if their referent is packed and the client
277277
has requested include-tags.
278278

279279
Clients MUST be prepared for the case where a server has ignored

Documentation/technical/commit-graph.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ Design Details
136136

137137
- Commit grafts and replace objects can change the shape of the commit
138138
history. The latter can also be enabled/disabled on the fly using
139-
`--no-replace-objects`. This leads to difficultly storing both possible
139+
`--no-replace-objects`. This leads to difficulty storing both possible
140140
interpretations of a commit id, especially when computing generation
141141
numbers. The commit-graph will not be read or written when
142142
replace-objects or grafts are present.

Documentation/technical/parallel-checkout.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ information, the main process handles the results in two steps:
148148

149149
- First, it updates the in-memory index with the `lstat()` information
150150
sent by the workers. (This must be done first as this information
151-
might me required in the following step.)
151+
might be required in the following step.)
152152

153153
- Then it writes the items which collided on disk (i.e. items marked
154154
with `PC_ITEM_COLLIDED`). More on this below.
@@ -232,7 +232,7 @@ conversion and re-encoding, are eligible for parallel checkout.
232232
Ineligible entries are checked out by the classic sequential codepath
233233
*before* spawning workers.
234234

235-
Note: submodules's files are also eligible for parallel checkout (as
235+
Note: submodules' files are also eligible for parallel checkout (as
236236
long as they don't fall into any of the excluding categories mentioned
237237
above). But since each submodule is checked out in its own child
238238
process, we don't mix the superproject's and the submodules' files in

0 commit comments

Comments
 (0)