Documentation: fix misuses of "nor"
Signed-off-by: Justin Lebar <jlebar@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
cee0c2750b
commit
a58088abe2
@ -99,7 +99,7 @@ static void setup_check(void)
|
||||
The attribute is Unset, by listing the name of the
|
||||
attribute prefixed with a dash - for the path.
|
||||
} else if (ATTR_UNSET(value)) {
|
||||
The attribute is not set nor unset for the path.
|
||||
The attribute is neither set nor unset for the path.
|
||||
} else if (!strcmp(value, "input")) {
|
||||
If none of ATTR_TRUE(), ATTR_FALSE(), or ATTR_UNSET() is
|
||||
true, the value is a string set in the gitattributes
|
||||
|
@ -237,10 +237,10 @@ The client now sends the maximum commit history depth it wants for
|
||||
this transaction, which is the number of commits it wants from the
|
||||
tip of the history, if any, as a 'deepen' line. A depth of 0 is the
|
||||
same as not making a depth request. The client does not want to receive
|
||||
any commits beyond this depth, nor objects needed only to complete
|
||||
those commits. Commits whose parents are not received as a result are
|
||||
defined as shallow and marked as such in the server. This information
|
||||
is sent back to the client in the next step.
|
||||
any commits beyond this depth, nor does it want objects needed only to
|
||||
complete those commits. Commits whose parents are not received as a
|
||||
result are defined as shallow and marked as such in the server. This
|
||||
information is sent back to the client in the next step.
|
||||
|
||||
Once all the 'want's and 'shallow's (and optional 'deepen') are
|
||||
transferred, clients MUST send a flush-pkt, to tell the server side
|
||||
|
@ -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`.
|
||||
|
||||
|
Reference in New Issue
Block a user