From: Justin Lebar <jlebar@google.com>
To: git@vger.kernel.org
Cc: "Justin Lebar" <jlebar@google.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Justin Lebar" <jlebar@gmail.com>
Subject: [PATCH 5/6] Fix misuses of "nor" outside comments
Date: Sat, 15 Mar 2014 01:42:01 -0700 [thread overview]
Message-ID: <1394872922-2000-6-git-send-email-jlebar@google.com> (raw)
In-Reply-To: <1394872922-2000-1-git-send-email-jlebar@google.com>
Signed-off-by: Justin Lebar <jlebar@gmail.com>
---
builtin/clean.c | 6 +++---
builtin/commit.c | 2 +-
git-add--interactive.perl | 4 ++--
perl/Git/SVN.pm | 4 ++--
sha1_file.c | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/builtin/clean.c b/builtin/clean.c
index 2f26297..fb1b357 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -903,11 +903,11 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
if (!interactive && !dry_run && !force) {
if (config_set)
- die(_("clean.requireForce set to true and neither -i, -n nor -f given; "
+ die(_("clean.requireForce set to true and neither -i, -n, nor -f given; "
"refusing to clean"));
else
- die(_("clean.requireForce defaults to true and neither -i, -n nor -f given; "
- "refusing to clean"));
+ die(_("clean.requireForce defaults to true and neither -i, -n, nor -f given;"
+ " refusing to clean"));
}
if (force > 1)
diff --git a/builtin/commit.c b/builtin/commit.c
index 3767478..6c6be8a 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1123,7 +1123,7 @@ static int parse_and_validate_options(int argc, const char *argv[],
if (argc == 0 && only && amend)
only_include_assumed = _("Clever... amending the last one with dirty index.");
if (argc > 0 && !also && !only)
- 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...");
if (!cleanup_arg || !strcmp(cleanup_arg, "default"))
cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE;
else if (!strcmp(cleanup_arg, "verbatim"))
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 24bb1ab..32c2f9c 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -1156,9 +1156,9 @@ sub help_patch_cmd {
print colored $help_color, <<EOF ;
y - $verb this hunk$target
n - do not $verb this hunk$target
-q - quit; do not $verb this hunk nor any of the remaining ones
+q - quit; do not $verb this hunk or any of the remaining ones
a - $verb this hunk and all later hunks in the file
-d - do not $verb this hunk nor any of the later hunks in the file
+d - do not $verb this hunk or any of the later hunks in the file
g - select a hunk to go to
/ - search for a hunk matching the given regex
j - leave this hunk undecided, see next undecided hunk
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index 62f3293..a59564f 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -480,8 +480,8 @@ sub refname {
# It cannot end with a slash /, we'll throw up on this because
# SVN can't have directories with a slash in their name, either:
if ($refname =~ m{/$}) {
- die "ref: '$refname' ends with a trailing slash, this is ",
- "not permitted by git nor Subversion\n";
+ die "ref: '$refname' ends with a trailing slash; this is ",
+ "not permitted by git or Subversion\n";
}
# It cannot have ASCII control character space, tilde ~, caret ^,
diff --git a/sha1_file.c b/sha1_file.c
index b79efe4..77dbb56 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1123,7 +1123,7 @@ static void report_helper(const struct string_list *list,
const char *msg;
switch (seen_bits) {
case 0:
- msg = "no corresponding .idx nor .pack";
+ msg = "no corresponding .idx or .pack";
break;
case 1:
msg = "no corresponding .idx";
--
1.9.0.279.gdc9e3eb
next prev parent reply other threads:[~2014-03-15 8:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-15 8:41 [PATCH 0/6] Fix misuses of "nor" Justin Lebar
2014-03-15 8:41 ` [PATCH 1/6] Documentation: " Justin Lebar
2014-03-15 8:41 ` [PATCH 2/6] contrib: " Justin Lebar
2014-03-15 8:41 ` [PATCH 3/6] l10n: " Justin Lebar
2014-03-17 1:45 ` Jiang Xin
2014-03-17 2:43 ` Justin Lebar
2014-03-15 8:42 ` [PATCH 4/6] Fix misuses of "nor" in comments Justin Lebar
2014-03-15 8:42 ` Justin Lebar [this message]
2014-03-15 8:42 ` [PATCH 6/6] Tests: Fix misuses of "nor" Justin Lebar
2014-03-15 8:56 ` [PATCH 0/6] " Duy Nguyen
2014-03-15 16:56 ` Justin Lebar
2014-03-15 23:45 ` Duy Nguyen
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1394872922-2000-6-git-send-email-jlebar@google.com \
--to=jlebar@google.com \
--cc=git@vger.kernel.org \
--cc=jlebar@gmail.com \
--cc=pclouds@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).