contrib: fix misuses of "nor"

Signed-off-by: Justin Lebar <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
luceliu · Mar 31, 2014 · e34b272 · e34b272
1 parent a58088a
commit e34b272
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/contrib/examples/git-commit.sh b/contrib/examples/git-commit.sh
@@ -280,7 +280,7 @@ case "$#,$also,$only,$amend" in
 0,,,*)
 	;;
 *,,,*)
-	only_include_assumed="# Explicit paths specified without -i nor -o; assuming --only paths..."
+	only_include_assumed="# Explicit paths specified without -i or -o; assuming --only paths..."
 	also=
 	;;
 esac

diff --git a/contrib/svn-fe/svn-fe.txt b/contrib/svn-fe/svn-fe.txt
@@ -40,8 +40,8 @@ manual page.
 NOTES
 -----
 Subversion dumps do not record a separate author and committer for
-each revision, nor a separate display name and email address for
-each author.  Like git-svn(1), 'svn-fe' will use the name
+each revision, nor do they record a separate display name and email
+address for each author.  Like git-svn(1), 'svn-fe' will use the name
 
 ---------
 user <user@UUID>
-Original file line number
+Diff line change
@@ Expand Up / @@ -280,7 +280,7 @@ case "$#,$also,$only,$amend" in @@
 ,,,*)
     	;;
     *,,,*)
-    	only_include_assumed="# Explicit paths specified without -i nor -o; assuming --only paths..."
+    	only_include_assumed="# Explicit paths specified without -i or -o; assuming --only paths..."
     	also=
     	;;
     esac
@@ Expand Down @@