summaryrefslogtreecommitdiff
path: root/Documentation/technical/protocol-common.txt
diff options
context:
space:
mode:
authorLibravatar Justin Lebar <jlebar@google.com>2014-03-31 15:11:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-31 15:16:22 -0700
commita58088abe2011b6f486de8acd54432f6d9bcecfc (patch)
treefdae618dee73d4a349c80321896d4f4a58344c35 /Documentation/technical/protocol-common.txt
parentGit 1.9.1 (diff)
downloadtgif-a58088abe2011b6f486de8acd54432f6d9bcecfc.tar.xz
Documentation: fix misuses of "nor"
Signed-off-by: Justin Lebar <jlebar@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical/protocol-common.txt')
-rw-r--r--Documentation/technical/protocol-common.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/technical/protocol-common.txt b/Documentation/technical/protocol-common.txt
index fb7ff084f8..889985f707 100644
--- a/Documentation/technical/protocol-common.txt
+++ b/Documentation/technical/protocol-common.txt
@@ -39,7 +39,7 @@ More specifically, they:
caret `^`, colon `:`, question-mark `?`, asterisk `*`,
or open bracket `[` anywhere.
-. They cannot end with a slash `/` nor a dot `.`.
+. They cannot end with a slash `/` or a dot `.`.
. They cannot end with the sequence `.lock`.