about summary refs log tree commit
diff options
context:
space:
mode:
authorJustin Lebar <jlebar@google.com>2014-03-31 15:11:45 -0700
committerJunio C Hamano <gitster@pobox.com>2014-03-31 15:17:56 -0700
commite34b272344c1e7eb640dcce5990a75460240daed (patch)
treeae0fc191413c1725230c2e85359f28113d3f697f
parenta58088abe2011b6f486de8acd54432f6d9bcecfc (diff)
downloadgit-e34b272344c1e7eb640dcce5990a75460240daed.tar.gz
Signed-off-by: Justin Lebar <jlebar@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xcontrib/examples/git-commit.sh2
-rw-r--r--contrib/svn-fe/svn-fe.txt4
2 files changed, 3 insertions, 3 deletions
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 <user@UUID>