contrib: fix misuses of "nor"
Signed-off-by: Justin Lebar <jlebar@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Justin Lebar committed
Mar 31, 2014 at 15:11 UTC
e34b272344c1e7eb640dcce5990a75460240daed
2 files changed
+3
-3
contrib/examples/git-commit.sh
+1
-1
@@ -280,7 +280,7 @@ case "$#,$also,$only,$amend" in
280
0,,,*)
281
;;
282
*,,,*)
283
- only_include_assumed="# Explicit paths specified without -i nor -o; assuming --only paths..."
283
+ only_include_assumed="# Explicit paths specified without -i or -o; assuming --only paths..."
284
also=
285
;;
286
esac
contrib/svn-fe/svn-fe.txt
+2
-2
@@ -40,8 +40,8 @@ manual page.
40
NOTES
41
-----
42
Subversion dumps do not record a separate author and committer for
43
-each revision, nor a separate display name and email address for
44
-each author. Like git-svn(1), 'svn-fe' will use the name
43
+each revision, nor do they record a separate display name and email
44
+address for each author. Like git-svn(1), 'svn-fe' will use the name
45
46
---------
47
user <user@UUID>