summaryrefslogtreecommitdiff
path: root/Documentation/glossary-content.txt
diff options
context:
space:
mode:
authorLibravatar Mark Rushakoff <mark.rushakoff@gmail.com>2019-08-02 22:33:51 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-08-05 10:05:24 -0700
commit6d16922798bbb87ddbc1ff1d23ba8ea65f4f6d3b (patch)
tree368d00c40a9d4aca1d30d7d8c23985030ceb34d9 /Documentation/glossary-content.txt
parentRelNotes/2.21.1: typofix (diff)
downloadtgif-6d16922798bbb87ddbc1ff1d23ba8ea65f4f6d3b.tar.xz
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 <mark.rushakoff@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/glossary-content.txt')
-rw-r--r--Documentation/glossary-content.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 8d38ae6010..090c888335 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -255,7 +255,7 @@ This commit is referred to as a "merge commit", or sometimes just a
[[def_object]]object::
The unit of storage in Git. It is uniquely identified by the
<<def_SHA1,SHA-1>> of its contents. Consequently, an
- object can not be changed.
+ object cannot be changed.
[[def_object_database]]object database::
Stores a set of "objects", and an individual <<def_object,object>> is