summaryrefslogtreecommitdiffstats
path: root/Documentation/technical/api-gitattributes.txt
diff options
context:
space:
mode:
authorJustin Lebar <jlebar@google.com>2014-04-01 00:11:44 +0200
committerJunio C Hamano <gitster@pobox.com>2014-04-01 00:16:22 +0200
commita58088abe2011b6f486de8acd54432f6d9bcecfc (patch)
treefdae618dee73d4a349c80321896d4f4a58344c35 /Documentation/technical/api-gitattributes.txt
parentGit 1.9.1 (diff)
downloadgit-a58088abe2011b6f486de8acd54432f6d9bcecfc.tar.xz
git-a58088abe2011b6f486de8acd54432f6d9bcecfc.zip
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/api-gitattributes.txt')
-rw-r--r--Documentation/technical/api-gitattributes.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/technical/api-gitattributes.txt b/Documentation/technical/api-gitattributes.txt
index ce363b6305..2602668677 100644
--- a/Documentation/technical/api-gitattributes.txt
+++ b/Documentation/technical/api-gitattributes.txt
@@ -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