From: Justin Lebar Date: Mon, 31 Mar 2014 22:11:45 +0000 (-0700) Subject: contrib: fix misuses of "nor" X-Git-Tag: v1.9.2~1^2~2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e34b272344c1e7eb640dcce5990a75460240daed?ds=inline;hp=--cc contrib: fix misuses of "nor" Signed-off-by: Justin Lebar Signed-off-by: Junio C Hamano --- e34b272344c1e7eb640dcce5990a75460240daed diff --git a/contrib/examples/git-commit.sh b/contrib/examples/git-commit.sh index 23ffb028d1..4aab1a6d21 100755 --- 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 index 1128ab2ce4..a3425f4770 100644 --- 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