From: Justin Lebar <jlebar@google.com>
To: git@vger.kernel.org
Cc: Justin Lebar <jlebar@google.com>,
Richard Hansen <rhansen@bbn.com>,
"Shawn O. Pearce" <spearce@spearce.org>,
Jeff King <peff@peff.net>, Jonathan Nieder <jrnieder@gmail.com>
Subject: [PATCH v5 2/4] contrib: Fix misuses of "nor"
Date: Mon, 31 Mar 2014 15:11:45 -0700 [thread overview]
Message-ID: <1396303907-23291-2-git-send-email-jlebar@google.com> (raw)
In-Reply-To: <1396303907-23291-1-git-send-email-jlebar@google.com>
Signed-off-by: Justin Lebar <jlebar@google.com>
---
contrib/examples/git-commit.sh | 2 +-
contrib/svn-fe/svn-fe.txt | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/examples/git-commit.sh b/contrib/examples/git-commit.sh
index 23ffb02..4aab1a6 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 1128ab2..a3425f4 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>
--
1.9.1.423.g4596e3a
next prev parent reply other threads:[~2014-03-31 22:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-31 22:11 [PATCH v5 1/4] Documentation: Fix misuses of "nor" Justin Lebar
2014-03-31 22:11 ` Justin Lebar [this message]
2014-03-31 22:11 ` [PATCH v5 3/4] Fix misuses of "nor" in comments Justin Lebar
2014-03-31 22:11 ` [PATCH v5 4/4] Fix misuses of "nor" outside comments and in tests Justin Lebar
2014-03-31 22:27 ` Junio C Hamano
2014-03-31 23:19 ` [PATCH v5 1/4] Documentation: Fix misuses of "nor" Junio C Hamano
2014-04-01 16:48 ` Justin Lebar
2014-04-01 19:04 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1396303907-23291-2-git-send-email-jlebar@google.com \
--to=jlebar@google.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=rhansen@bbn.com \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).