Skip to content

Commit 6d16922

Browse files
mark-rushakoffgitster
authored andcommitted
doc: typo: s/can not/cannot/ and s/is does/does/
"Can not" suggests one has the option to not do something, whereas "cannot" more strongly suggests something is disallowed or impossible. Noticed "can not", mistakenly used instead of "cannot" in git help glossary, then ran git grep 'can not' and found many other instances. Only files in the Documentation folder were modified. 'Can not' also occurs in some source code comments and some test assertion messages, and there is an error message and translation "can not move directory into itself" which I may fix and submit separately from the documentation change. Also noticed and fixed "is does" in git help fetch, but there are no other occurrences of that typo according to git grep. Signed-off-by: Mark Rushakoff <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4d8ec15 commit 6d16922

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

Documentation/config/transfer.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ linkgit:git-receive-pack[1]. On the fetch side, malformed objects will
1717
instead be left unreferenced in the repository.
1818
+
1919
Due to the non-quarantine nature of the `fetch.fsckObjects`
20-
implementation it can not be relied upon to leave the object store
20+
implementation it cannot be relied upon to leave the object store
2121
clean like `receive.fsckObjects` can.
2222
+
2323
As objects are unpacked they're written to the object store, so there

Documentation/git-cvsserver.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ write so it might not be enough to grant the users using
232232
'git-cvsserver' write access to the database file without granting
233233
them write access to the directory, too.
234234

235-
The database can not be reliably regenerated in a
235+
The database cannot be reliably regenerated in a
236236
consistent form after the branch it is tracking has changed.
237237
Example: For merged branches, 'git-cvsserver' only tracks
238238
one branch of development, and after a 'git merge' an

Documentation/git-fetch.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ This updates (or creates, as necessary) branches `pu` and `tmp` in
262262
the local repository by fetching from the branches (respectively)
263263
`pu` and `maint` from the remote repository.
264264
+
265-
The `pu` branch will be updated even if it is does not fast-forward,
265+
The `pu` branch will be updated even if it does not fast-forward,
266266
because it is prefixed with a plus sign; `tmp` will not be.
267267

268268
* Peek at a remote's branch, without configuring the remote in your local
@@ -285,7 +285,7 @@ BUGS
285285
----
286286
Using --recurse-submodules can only fetch new commits in already checked
287287
out submodules right now. When e.g. upstream added a new submodule in the
288-
just fetched commits of the superproject the submodule itself can not be
288+
just fetched commits of the superproject the submodule itself cannot be
289289
fetched, making it impossible to check out that submodule later without
290290
having to do a fetch again. This is expected to be fixed in a future Git
291291
version.

Documentation/git-pull.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ BUGS
249249
----
250250
Using --recurse-submodules can only fetch new commits in already checked
251251
out submodules right now. When e.g. upstream added a new submodule in the
252-
just fetched commits of the superproject the submodule itself can not be
252+
just fetched commits of the superproject the submodule itself cannot be
253253
fetched, making it impossible to check out that submodule later without
254254
having to do a fetch again. This is expected to be fixed in a future Git
255255
version.

Documentation/glossary-content.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ This commit is referred to as a "merge commit", or sometimes just a
255255
[[def_object]]object::
256256
The unit of storage in Git. It is uniquely identified by the
257257
<<def_SHA1,SHA-1>> of its contents. Consequently, an
258-
object can not be changed.
258+
object cannot be changed.
259259

260260
[[def_object_database]]object database::
261261
Stores a set of "objects", and an individual <<def_object,object>> is

Documentation/technical/api-ref-iteration.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ this:
5454
do not do this you will get an error for each ref that it does not point
5555
to a valid object.
5656

57-
Note: As a side-effect of this you can not safely assume that all
57+
Note: As a side-effect of this you cannot safely assume that all
5858
objects you lookup are available in superproject. All submodule objects
5959
will be available the same way as the superprojects objects.
6060

0 commit comments

Comments
 (0)