Re: [PATCH v5 1/4] Documentation: Fix misuses of "nor"
Thanks a lot, Junio. It's unclear to me: Are we done with this patch queue, or do I need to worry about getting these patches into another branch? If the latter, I'll update patch v5 per your comments. -Justin On Mon, Mar 31, 2014 at 4:19 PM, Junio C Hamano wrote: > Four patches queued on 'pu' as-is (but retitled). I didn't read > everything very carefully, though. > > Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v5 3/4] Fix misuses of "nor" in comments
Signed-off-by: Justin Lebar
---
Makefile| 2 +-
builtin/apply.c | 2 +-
builtin/checkout.c | 2 +-
builtin/log.c | 2 +-
builtin/pack-objects.c | 2 +-
column.c| 4 ++--
contrib/examples/git-checkout.sh| 2 +-
contrib/examples/git-reset.sh | 4 ++--
contrib/fast-import/import-directories.perl | 4 ++--
delta.h | 2 +-
diff.c | 2 +-
git-am.sh | 2 +-
gitweb/gitweb.perl | 2 +-
http.h | 3 +--
perl/Git/SVN.pm | 2 +-
perl/Git/SVN/Migration.pm | 2 +-
pkt-line.h | 8
remote.c| 2 +-
sha1_file.c | 2 +-
test-chmtime.c | 2 +-
20 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/Makefile b/Makefile
index dddaf4f..fc02788 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ all::
#
# Define NEEDS_LIBINTL_BEFORE_LIBICONV if you need libintl before libiconv.
#
-# Define NO_INTPTR_T if you don't have intptr_t nor uintptr_t.
+# Define NO_INTPTR_T if you don't have intptr_t or uintptr_t.
#
# Define NO_UINTMAX_T if you don't have uintmax_t.
#
diff --git a/builtin/apply.c b/builtin/apply.c
index b0d0986..6013e19 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -4061,7 +4061,7 @@ static int write_out_one_reject(struct patch *patch)
return error(_("cannot open %s: %s"), namebuf, strerror(errno));
/* Normal git tools never deal with .rej, so do not pretend
-* this is a git patch by saying --git nor give extended
+* this is a git patch by saying --git or giving extended
* headers. While at it, maybe please "kompare" that wants
* the trailing TAB and some garbage at the end of line ;-).
*/
diff --git a/builtin/checkout.c b/builtin/checkout.c
index ada51fa..7f37d1a 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -895,7 +895,7 @@ static int parse_branchname_arg(int argc, const char **argv,
* between A and B, A...B names that merge base.
*
* (b) If is _not_ a commit, either "--" is present
-* or is not a path, no -t nor -b was given, and
+* or is not a path, no -t or -b was given, and
* and there is a tracking branch whose name is
* in one and only one remote, then this is a short-hand to
* fork local from that remote-tracking branch.
diff --git a/builtin/log.c b/builtin/log.c
index b97373d..39e8836 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -503,7 +503,7 @@ static void show_rev_tweak_rev(struct rev_info *rev, struct
setup_revision_opt *
/* There was no "-m" on the command line */
rev->ignore_merges = 0;
if (!rev->first_parent_only && !rev->combine_merges) {
- /* No "--first-parent", "-c", nor "--cc" */
+ /* No "--first-parent", "-c", or "--cc" */
rev->combine_merges = 1;
rev->dense_combined_merges = 1;
}
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 541667f..ef1f20e 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -999,7 +999,7 @@ static int pbase_tree_cache_ix_incr(int ix)
static struct pbase_tree {
struct pbase_tree *next;
/* This is a phony "cache" entry; we are not
-* going to evict it nor find it through _get()
+* going to evict it or find it through _get()
* mechanism -- this is for the toplevel node that
* would almost always change with any commit.
*/
diff --git a/column.c b/column.c
index 9367ba5..8d1ce88 100644
--- a/column.c
+++ b/column.c
@@ -311,8 +311,8 @@ static int parse_config(unsigned int *colopts, const char
*value)
value += strspn(value, sep);
}
/*
-* Setting layout implies "always" if neither always, never
-* nor auto is specified.
+* If none of "always", "never", and "auto" is specified, then setting
+* layout implies "always".
*
* Current value in COL_ENABLE_MASK is disregarded. This means if
* you set column.ui = auto and pass --column=row, then "auto"
diff --git a/contrib/examples/git-checkout.sh b/contrib/examples/git-checkout.sh
index 1a7689a..d2c1f98 100755
--- a/contrib/exam
[PATCH v5 4/4] Fix misuses of "nor" outside comments and in tests
Signed-off-by: Justin Lebar
---
builtin/clean.c | 6 +++---
builtin/commit.c | 2 +-
git-add--interactive.perl | 4 ++--
perl/Git/SVN.pm | 4 ++--
sha1_file.c | 2 +-
t/t1001-read-tree-m-2way.sh | 2 +-
t/t4005-diff-rename-2.sh | 2 +-
t/t4009-diff-rename-4.sh | 2 +-
t/t5304-prune.sh | 2 +-
t/t6036-recursive-corner-cases.sh | 2 +-
t/t7104-reset.sh | 2 +-
t/t9400-git-cvsserver-server.sh | 2 +-
12 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/builtin/clean.c b/builtin/clean.c
index 5502957..977a068 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 26b2986..5d594a4 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, <http://vger.kernel.org/majordomo-info.html
[PATCH v5 2/4] contrib: Fix misuses of "nor"
Signed-off-by: Justin Lebar --- 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 -- 1.9.1.423.g4596e3a -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v5 1/4] Documentation: Fix misuses of "nor"
Signed-off-by: Justin Lebar
---
Documentation/CodingGuidelines | 4 ++--
Documentation/config.txt| 6 +++---
Documentation/diff-generate-patch.txt | 2 +-
Documentation/diff-options.txt | 2 +-
Documentation/everyday.txt | 2 +-
Documentation/git-add.txt | 4 ++--
Documentation/git-count-objects.txt | 4 ++--
Documentation/git-diff.txt | 4 ++--
Documentation/git-prune.txt | 2 +-
Documentation/git-push.txt | 2 +-
Documentation/git-read-tree.txt | 2 +-
Documentation/git-reset.txt | 6 +++---
Documentation/git-show-branch.txt | 2 +-
Documentation/git-show-ref.txt | 2 +-
Documentation/howto/rebase-from-internal-branch.txt | 2 +-
Documentation/howto/revert-a-faulty-merge.txt | 4 ++--
Documentation/howto/revert-branch-rebase.txt| 2 +-
Documentation/merge-options.txt | 15 +++
Documentation/pretty-formats.txt| 2 +-
Documentation/pretty-options.txt| 2 +-
Documentation/rev-list-options.txt | 2 +-
Documentation/technical/api-gitattributes.txt | 2 +-
Documentation/technical/pack-protocol.txt | 8
Documentation/technical/protocol-common.txt | 2 +-
Documentation/user-manual.txt | 2 +-
25 files changed, 43 insertions(+), 44 deletions(-)
diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index ef67b53..b99fa87 100644
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -91,13 +91,13 @@ For shell scripts specifically (not exhaustive):
E.g.: my_function () {
- As to use of grep, stick to a subset of BRE (namely, no \{m,n\},
- [::], [==], nor [..]) for portability.
+ [::], [==], or [..]) for portability.
- We do not use \{m,n\};
- We do not use -E;
- - We do not use ? nor + (which are \{0,1\} and \{1,\}
+ - We do not use ? or + (which are \{0,1\} and \{1,\}
respectively in BRE) but that goes without saying as these
are ERE elements not BRE (note that \? and \+ are not even part
of BRE -- making them accessible from BRE is a GNU extension).
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 5f4d793..c26a7c8 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -78,8 +78,8 @@ be escaped: use `\"` for `"` and `\\` for `\`.
The following escape sequences (beside `\"` and `\\`) are recognized:
`\n` for newline character (NL), `\t` for horizontal tabulation (HT, TAB)
-and `\b` for backspace (BS). No other char escape sequence, nor octal
-char sequences are valid.
+and `\b` for backspace (BS). Other char escape sequences (including octal
+escape sequences) are invalid.
Variable values ending in a `\` are continued on the next line in the
customary UNIX fashion.
@@ -827,7 +827,7 @@ color.diff::
commands will only use color when output is to the terminal.
Defaults to false.
+
-This does not affect linkgit:git-format-patch[1] nor the
+This does not affect linkgit:git-format-patch[1] or the
'git-diff-{asterisk}' plumbing commands. Can be overridden on the
command line with the `--color[=]` option.
diff --git a/Documentation/diff-generate-patch.txt
b/Documentation/diff-generate-patch.txt
index 55f499a..843a20b 100644
--- a/Documentation/diff-generate-patch.txt
+++ b/Documentation/diff-generate-patch.txt
@@ -174,7 +174,7 @@ added, from the point of view of that parent).
In the above example output, the function signature was changed
from both files (hence two `-` removals from both file1 and
file2, plus `++` to mean one line that was added does not appear
-in either file1 nor file2). Also eight other lines are the same
+in either file1 or file2). Also eight other lines are the same
from file1 but do not appear in file2 (hence prefixed with `+`).
When shown by `git diff-tree -c`, it compares the parents of a
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 9b37b2a..6cb083a 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -358,7 +358,7 @@ endif::git-log[]
--irreversible-delete::
Omit the preimage for deletes, i.e. print only the header but not
the diff between the preimage and `/dev/null`. The resulting patch
- is not meant to be applied with `patch` nor `git apply`; this is
+ is not meant to be applied with `patch` or `git apply`; this is
solely for people who want to just concentrate on reviewing the
text after the change. In addition, the output obviously lack
enough information to apply such a patch in reverse, ev
Re: [PATCH 3/6] Fix misuses of "nor" in comments.
Sorry, still figuring out the right workflow here: The subject should
say v4, and it should say patch 3/4.
On Mon, Mar 31, 2014 at 2:04 PM, Justin Lebar wrote:
> Signed-off-by: Justin Lebar
> ---
> Makefile| 2 +-
> builtin/apply.c | 2 +-
> builtin/checkout.c | 2 +-
> builtin/log.c | 2 +-
> builtin/pack-objects.c | 2 +-
> column.c| 4 ++--
> contrib/examples/git-checkout.sh| 2 +-
> contrib/examples/git-reset.sh | 4 ++--
> contrib/fast-import/import-directories.perl | 4 ++--
> delta.h | 2 +-
> diff.c | 2 +-
> git-am.sh | 2 +-
> gitweb/gitweb.perl | 2 +-
> http.h | 3 +--
> perl/Git/SVN.pm | 2 +-
> perl/Git/SVN/Migration.pm | 2 +-
> pkt-line.h | 8
> remote.c| 2 +-
> sha1_file.c | 2 +-
> test-chmtime.c | 2 +-
> 20 files changed, 26 insertions(+), 27 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index dddaf4f..fc02788 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -159,7 +159,7 @@ all::
> #
> # Define NEEDS_LIBINTL_BEFORE_LIBICONV if you need libintl before libiconv.
> #
> -# Define NO_INTPTR_T if you don't have intptr_t nor uintptr_t.
> +# Define NO_INTPTR_T if you don't have intptr_t or uintptr_t.
> #
> # Define NO_UINTMAX_T if you don't have uintmax_t.
> #
> diff --git a/builtin/apply.c b/builtin/apply.c
> index b0d0986..6013e19 100644
> --- a/builtin/apply.c
> +++ b/builtin/apply.c
> @@ -4061,7 +4061,7 @@ static int write_out_one_reject(struct patch *patch)
> return error(_("cannot open %s: %s"), namebuf,
> strerror(errno));
>
> /* Normal git tools never deal with .rej, so do not pretend
> -* this is a git patch by saying --git nor give extended
> +* this is a git patch by saying --git or giving extended
> * headers. While at it, maybe please "kompare" that wants
> * the trailing TAB and some garbage at the end of line ;-).
> */
> diff --git a/builtin/checkout.c b/builtin/checkout.c
> index ada51fa..7f37d1a 100644
> --- a/builtin/checkout.c
> +++ b/builtin/checkout.c
> @@ -895,7 +895,7 @@ static int parse_branchname_arg(int argc, const char
> **argv,
> * between A and B, A...B names that merge base.
> *
> * (b) If is _not_ a commit, either "--" is present
> -* or is not a path, no -t nor -b was given, and
> +* or is not a path, no -t or -b was given, and
> * and there is a tracking branch whose name is
> * in one and only one remote, then this is a short-hand to
> * fork local from that remote-tracking branch.
> diff --git a/builtin/log.c b/builtin/log.c
> index b97373d..39e8836 100644
> --- a/builtin/log.c
> +++ b/builtin/log.c
> @@ -503,7 +503,7 @@ static void show_rev_tweak_rev(struct rev_info *rev,
> struct setup_revision_opt *
> /* There was no "-m" on the command line */
> rev->ignore_merges = 0;
> if (!rev->first_parent_only && !rev->combine_merges) {
> - /* No "--first-parent", "-c", nor "--cc" */
> + /* No "--first-parent", "-c", or "--cc" */
> rev->combine_merges = 1;
> rev->dense_combined_merges = 1;
> }
> diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
> index 541667f..ef1f20e 100644
> --- a/builtin/pack-objects.c
> +++ b/builtin/pack-objects.c
> @@ -999,7 +999,7 @@ static int pbase_tree_cache_ix_incr(int ix)
> static struct pbase_tree {
> struct pbase_tree *next;
> /* This is a phony "cache" entry; we are not
> -* going to evict it nor find it through _get()
> +* going to evict it or find it through _get()
> * mechanism -- this is for the toplevel node that
> * would almost always change with any commit.
> */
> diff --git a/column.c b/column.c
> index 9367ba5..8d1ce88 100644
> --- a/column.c
> +++ b/column.c
> @@ -311,8 +311,8 @@ static int parse_config(unsigned int *colopts,
Re: [PATCH 3/4] Fix misuses of "nor" in comments. (v3)
Thanks; fixed in v4 (just sent out). On Mon, Mar 31, 2014 at 12:54 PM, Jason St. John wrote: > On Sat, Mar 29, 2014 at 6:59 PM, Justin Lebar wrote: >> This version applies successfully to master, maint, next, and pu. The other >> patches in the previous version of this queue apply successfully without any >> changes. >> >> Signed-off-by: Justin Lebar >> >> --- >> Makefile| 2 +- >> builtin/apply.c | 2 +- >> builtin/checkout.c | 2 +- >> builtin/log.c | 2 +- >> builtin/pack-objects.c | 2 +- >> column.c| 4 ++-- >> contrib/examples/git-checkout.sh| 2 +- >> contrib/examples/git-reset.sh | 4 ++-- >> contrib/fast-import/import-directories.perl | 4 ++-- >> delta.h | 2 +- >> diff.c | 2 +- >> git-am.sh | 2 +- >> gitweb/gitweb.perl | 2 +- >> http.h | 4 ++-- >> perl/Git/SVN.pm | 2 +- >> perl/Git/SVN/Migration.pm | 2 +- >> pkt-line.h | 8 >> remote.c| 2 +- >> sha1_file.c | 2 +- >> test-chmtime.c | 2 +- >> 20 files changed, 27 insertions(+), 27 deletions(-) >> > > > >> diff --git a/http.h b/http.h >> index cd37d58..0a7d286 100644 >> --- a/http.h >> +++ b/http.h >> @@ -13,8 +13,8 @@ >> /* >> * We detect based on the cURL version if multi-transfer is >> * usable in this implementation and define this symbol accordingly. >> - * This is not something Makefile should set nor users should pass >> - * via CFLAGS. >> + * This shouldn't be be set by the Makefile or by the user (e.g. via >> + * CFLAGS). >> */ >> #undef USE_CURL_MULTI > > There's a rather minor typo here: "be be" > > Jason -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/6] Fix misuses of "nor" in comments.
Signed-off-by: Justin Lebar
---
Makefile| 2 +-
builtin/apply.c | 2 +-
builtin/checkout.c | 2 +-
builtin/log.c | 2 +-
builtin/pack-objects.c | 2 +-
column.c| 4 ++--
contrib/examples/git-checkout.sh| 2 +-
contrib/examples/git-reset.sh | 4 ++--
contrib/fast-import/import-directories.perl | 4 ++--
delta.h | 2 +-
diff.c | 2 +-
git-am.sh | 2 +-
gitweb/gitweb.perl | 2 +-
http.h | 3 +--
perl/Git/SVN.pm | 2 +-
perl/Git/SVN/Migration.pm | 2 +-
pkt-line.h | 8
remote.c| 2 +-
sha1_file.c | 2 +-
test-chmtime.c | 2 +-
20 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/Makefile b/Makefile
index dddaf4f..fc02788 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ all::
#
# Define NEEDS_LIBINTL_BEFORE_LIBICONV if you need libintl before libiconv.
#
-# Define NO_INTPTR_T if you don't have intptr_t nor uintptr_t.
+# Define NO_INTPTR_T if you don't have intptr_t or uintptr_t.
#
# Define NO_UINTMAX_T if you don't have uintmax_t.
#
diff --git a/builtin/apply.c b/builtin/apply.c
index b0d0986..6013e19 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -4061,7 +4061,7 @@ static int write_out_one_reject(struct patch *patch)
return error(_("cannot open %s: %s"), namebuf, strerror(errno));
/* Normal git tools never deal with .rej, so do not pretend
-* this is a git patch by saying --git nor give extended
+* this is a git patch by saying --git or giving extended
* headers. While at it, maybe please "kompare" that wants
* the trailing TAB and some garbage at the end of line ;-).
*/
diff --git a/builtin/checkout.c b/builtin/checkout.c
index ada51fa..7f37d1a 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -895,7 +895,7 @@ static int parse_branchname_arg(int argc, const char **argv,
* between A and B, A...B names that merge base.
*
* (b) If is _not_ a commit, either "--" is present
-* or is not a path, no -t nor -b was given, and
+* or is not a path, no -t or -b was given, and
* and there is a tracking branch whose name is
* in one and only one remote, then this is a short-hand to
* fork local from that remote-tracking branch.
diff --git a/builtin/log.c b/builtin/log.c
index b97373d..39e8836 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -503,7 +503,7 @@ static void show_rev_tweak_rev(struct rev_info *rev, struct
setup_revision_opt *
/* There was no "-m" on the command line */
rev->ignore_merges = 0;
if (!rev->first_parent_only && !rev->combine_merges) {
- /* No "--first-parent", "-c", nor "--cc" */
+ /* No "--first-parent", "-c", or "--cc" */
rev->combine_merges = 1;
rev->dense_combined_merges = 1;
}
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 541667f..ef1f20e 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -999,7 +999,7 @@ static int pbase_tree_cache_ix_incr(int ix)
static struct pbase_tree {
struct pbase_tree *next;
/* This is a phony "cache" entry; we are not
-* going to evict it nor find it through _get()
+* going to evict it or find it through _get()
* mechanism -- this is for the toplevel node that
* would almost always change with any commit.
*/
diff --git a/column.c b/column.c
index 9367ba5..8d1ce88 100644
--- a/column.c
+++ b/column.c
@@ -311,8 +311,8 @@ static int parse_config(unsigned int *colopts, const char
*value)
value += strspn(value, sep);
}
/*
-* Setting layout implies "always" if neither always, never
-* nor auto is specified.
+* If none of "always", "never", and "auto" is specified, then setting
+* layout implies "always".
*
* Current value in COL_ENABLE_MASK is disregarded. This means if
* you set column.ui = auto and pass --column=row, then "auto"
diff --git a/contrib/examples/git-checkout.sh b/contrib/examples/git-checkout.sh
index 1a7689a..d2c1f98 100755
--- a/contrib/exam
[PATCH 3/4] Fix misuses of "nor" in comments. (v3)
This version applies successfully to master, maint, next, and pu. The other
patches in the previous version of this queue apply successfully without any
changes.
Signed-off-by: Justin Lebar
---
Makefile| 2 +-
builtin/apply.c | 2 +-
builtin/checkout.c | 2 +-
builtin/log.c | 2 +-
builtin/pack-objects.c | 2 +-
column.c| 4 ++--
contrib/examples/git-checkout.sh| 2 +-
contrib/examples/git-reset.sh | 4 ++--
contrib/fast-import/import-directories.perl | 4 ++--
delta.h | 2 +-
diff.c | 2 +-
git-am.sh | 2 +-
gitweb/gitweb.perl | 2 +-
http.h | 4 ++--
perl/Git/SVN.pm | 2 +-
perl/Git/SVN/Migration.pm | 2 +-
pkt-line.h | 8
remote.c| 2 +-
sha1_file.c | 2 +-
test-chmtime.c | 2 +-
20 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/Makefile b/Makefile
index dddaf4f..fc02788 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ all::
#
# Define NEEDS_LIBINTL_BEFORE_LIBICONV if you need libintl before libiconv.
#
-# Define NO_INTPTR_T if you don't have intptr_t nor uintptr_t.
+# Define NO_INTPTR_T if you don't have intptr_t or uintptr_t.
#
# Define NO_UINTMAX_T if you don't have uintmax_t.
#
diff --git a/builtin/apply.c b/builtin/apply.c
index b0d0986..6013e19 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -4061,7 +4061,7 @@ static int write_out_one_reject(struct patch *patch)
return error(_("cannot open %s: %s"), namebuf, strerror(errno));
/* Normal git tools never deal with .rej, so do not pretend
-* this is a git patch by saying --git nor give extended
+* this is a git patch by saying --git or giving extended
* headers. While at it, maybe please "kompare" that wants
* the trailing TAB and some garbage at the end of line ;-).
*/
diff --git a/builtin/checkout.c b/builtin/checkout.c
index ada51fa..7f37d1a 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -895,7 +895,7 @@ static int parse_branchname_arg(int argc, const char **argv,
* between A and B, A...B names that merge base.
*
* (b) If is _not_ a commit, either "--" is present
-* or is not a path, no -t nor -b was given, and
+* or is not a path, no -t or -b was given, and
* and there is a tracking branch whose name is
* in one and only one remote, then this is a short-hand to
* fork local from that remote-tracking branch.
diff --git a/builtin/log.c b/builtin/log.c
index b97373d..39e8836 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -503,7 +503,7 @@ static void show_rev_tweak_rev(struct rev_info *rev, struct
setup_revision_opt *
/* There was no "-m" on the command line */
rev->ignore_merges = 0;
if (!rev->first_parent_only && !rev->combine_merges) {
- /* No "--first-parent", "-c", nor "--cc" */
+ /* No "--first-parent", "-c", or "--cc" */
rev->combine_merges = 1;
rev->dense_combined_merges = 1;
}
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 541667f..ef1f20e 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -999,7 +999,7 @@ static int pbase_tree_cache_ix_incr(int ix)
static struct pbase_tree {
struct pbase_tree *next;
/* This is a phony "cache" entry; we are not
-* going to evict it nor find it through _get()
+* going to evict it or find it through _get()
* mechanism -- this is for the toplevel node that
* would almost always change with any commit.
*/
diff --git a/column.c b/column.c
index 9367ba5..8d1ce88 100644
--- a/column.c
+++ b/column.c
@@ -311,8 +311,8 @@ static int parse_config(unsigned int *colopts, const char
*value)
value += strspn(value, sep);
}
/*
-* Setting layout implies "always" if neither always, never
-* nor auto is specified.
+* If none of "always", "never", and "auto" is specified, then setting
+* layout implies "always".
*
* Current value in COL_ENABLE_MASK is disregarded. This means if
* you set column.ui = auto and pass
Re: [PATCH 3/4] Fix misuses of "nor" in comments
> I feel like I'm splitting hairs, but I think there's a change in
> meaning if you use that phrasing. The difference being "not expecting"
> vs. "should not". I don't know which is correct, so I'll defer that to
> someone else.
Okay, changed to
+ * This shouldn't be be set by the Makefile or by the user (e.g. via
+ * CFLAGS).
My intent is not to get hung up on any of these points, so I'm also
happy to punt on this or any hunk.
I'll send out new versions of the patches which apply to maint,
master, next, and pu in a bit.
-Justin
On Sat, Mar 22, 2014 at 4:47 PM, Jason St. John wrote:
> On Thu, Mar 20, 2014 at 7:13 PM, Justin Lebar wrote:
>> Thanks for the quick reply.
>>
>> When I send a new patch, should I fold these changes into the original
>> commit, or should I send them as a separate commit?
>>
>>>> diff --git a/builtin/apply.c b/builtin/apply.c
>>>> index b0d0986..6013e19 100644
>>>> --- a/builtin/apply.c
>>>> +++ b/builtin/apply.c
>>>> @@ -4061,7 +4061,7 @@ static int write_out_one_reject(struct patch *patch)
>>>> return error(_("cannot open %s: %s"), namebuf,
>>>> strerror(errno));
>>>>
>>>> /* Normal git tools never deal with .rej, so do not pretend
>>>> -* this is a git patch by saying --git nor give extended
>>>> +* this is a git patch by saying --git or giving extended
>>>> * headers. While at it, maybe please "kompare" that wants
>>>> * the trailing TAB and some garbage at the end of line ;-).
>>>> */
>>>
>>> I don't think the change from "give" to "giving" here is grammatically
>>> correct.
>>
>> Is it? I might be misunderstanding the sentence, then. I parse the
>> new sentence as
>>
>> Do not pretend this is a git patch by
>> - saying --git, or
>> - giving extended headers.
>>
>> "Giving" is definitely awkward, but I'm not sure of a better word.
>>
>> I'm happy to rephrase this, but I'm not sure how. I don't think the
>> original makes much sense, but I'm also happy to leave it.
>>
>
> You're right; that makes sense. Disregard my comment about that chunk.
>
>>> How about ``If none of "always", "never", or "auto" is specified, then
>>> setting layout
>>> implies "always".``?
>>
>> Sure.
>>
>>> To leave "nor" here, I think you need to replace "not" with "neither".
>>
>> I think it actually works after the change, but unfortunately Garner's
>> doesn't give me a lot of ammunition to back up that feeling. :)
>>
>> How about "We don't expect this to be set by the Makefile or by the
>> user (via CFLAGS)."
>>
>
> I feel like I'm splitting hairs, but I think there's a change in
> meaning if you use that phrasing. The difference being "not expecting"
> vs. "should not". I don't know which is correct, so I'll defer that to
> someone else.
>
>>> This would be better worded as "If src_buffer and *src_buffer are not NULL,
>>> it should ..."
>>
>> Done.
>>
>> -Justin
>
> Jason
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/4] Fix misuses of "nor" in comments
Thanks for the quick reply.
When I send a new patch, should I fold these changes into the original
commit, or should I send them as a separate commit?
>> diff --git a/builtin/apply.c b/builtin/apply.c
>> index b0d0986..6013e19 100644
>> --- a/builtin/apply.c
>> +++ b/builtin/apply.c
>> @@ -4061,7 +4061,7 @@ static int write_out_one_reject(struct patch *patch)
>> return error(_("cannot open %s: %s"), namebuf,
>> strerror(errno));
>>
>> /* Normal git tools never deal with .rej, so do not pretend
>> -* this is a git patch by saying --git nor give extended
>> +* this is a git patch by saying --git or giving extended
>> * headers. While at it, maybe please "kompare" that wants
>> * the trailing TAB and some garbage at the end of line ;-).
>> */
>
> I don't think the change from "give" to "giving" here is grammatically
> correct.
Is it? I might be misunderstanding the sentence, then. I parse the
new sentence as
Do not pretend this is a git patch by
- saying --git, or
- giving extended headers.
"Giving" is definitely awkward, but I'm not sure of a better word.
I'm happy to rephrase this, but I'm not sure how. I don't think the
original makes much sense, but I'm also happy to leave it.
> How about ``If none of "always", "never", or "auto" is specified, then
> setting layout
> implies "always".``?
Sure.
> To leave "nor" here, I think you need to replace "not" with "neither".
I think it actually works after the change, but unfortunately Garner's
doesn't give me a lot of ammunition to back up that feeling. :)
How about "We don't expect this to be set by the Makefile or by the
user (via CFLAGS)."
> This would be better worded as "If src_buffer and *src_buffer are not NULL,
> it should ..."
Done.
-Justin
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 4/4] Fix misuses of "nor" outside comments and in tests
Signed-off-by: Justin Lebar
---
builtin/clean.c | 6 +++---
builtin/commit.c | 2 +-
git-add--interactive.perl | 4 ++--
perl/Git/SVN.pm | 4 ++--
sha1_file.c | 2 +-
t/t1001-read-tree-m-2way.sh | 2 +-
t/t4005-diff-rename-2.sh | 2 +-
t/t4009-diff-rename-4.sh | 2 +-
t/t5304-prune.sh | 2 +-
t/t6036-recursive-corner-cases.sh | 2 +-
t/t7104-reset.sh | 2 +-
t/t9400-git-cvsserver-server.sh | 2 +-
12 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/builtin/clean.c b/builtin/clean.c
index 5502957..977a068 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 26b2986..5d594a4 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, <http://vger.kernel.org/majordomo-info.html
[PATCH 0/4] Fix misuses of "nor" (v2)
I got annoyed by git's awkward use of "nor" in man pages and in git add -p, so I went ahead and audited all uses of "nor" in the tree. One might be able to argue that some of the uses I've changed are technically acceptable, but that's a pretty low bar to set for ourselves. I aimed to make everything both correct and idiomatic. All I really care about is git-add--interactive.perl and (to a lesser extent) the docs, so if any of these other changes are controversial or annoying to take, I'm happy to drop them. Changes from v1 are: - Drop the l10n patch (changes will be automatically picked up later). - Fold the inside-tests and outside-tests patches. - CC different people, as Duy indicated he wasn't comfortable reviewing. Justin Lebar (4): Documentation: Fix misuses of "nor" contrib: Fix misuses of "nor" Fix misuses of "nor" in comments Fix misuses of "nor" outside comments and in tests Documentation/CodingGuidelines | 4 ++-- Documentation/config.txt| 6 +++--- Documentation/diff-generate-patch.txt | 2 +- Documentation/diff-options.txt | 2 +- Documentation/everyday.txt | 2 +- Documentation/git-add.txt | 4 ++-- Documentation/git-count-objects.txt | 4 ++-- Documentation/git-diff.txt | 4 ++-- Documentation/git-prune.txt | 2 +- Documentation/git-push.txt | 2 +- Documentation/git-read-tree.txt | 2 +- Documentation/git-reset.txt | 6 +++--- Documentation/git-show-branch.txt | 2 +- Documentation/git-show-ref.txt | 2 +- Documentation/howto/rebase-from-internal-branch.txt | 2 +- Documentation/howto/revert-a-faulty-merge.txt | 4 ++-- Documentation/howto/revert-branch-rebase.txt| 2 +- Documentation/merge-options.txt | 15 +++ Documentation/pretty-formats.txt| 2 +- Documentation/pretty-options.txt| 2 +- Documentation/rev-list-options.txt | 2 +- Documentation/technical/api-gitattributes.txt | 2 +- Documentation/technical/pack-protocol.txt | 8 Documentation/technical/protocol-common.txt | 2 +- Documentation/user-manual.txt | 2 +- Makefile| 2 +- builtin/apply.c | 2 +- builtin/checkout.c | 2 +- builtin/clean.c | 6 +++--- builtin/commit.c| 2 +- builtin/log.c | 2 +- builtin/pack-objects.c | 2 +- builtin/reset.c | 4 ++-- builtin/show-branch.c | 2 +- column.c| 2 +- contrib/examples/git-checkout.sh| 2 +- contrib/examples/git-commit.sh | 2 +- contrib/examples/git-reset.sh | 4 ++-- contrib/fast-import/import-directories.perl | 4 ++-- contrib/svn-fe/svn-fe.txt | 4 ++-- delta.h | 2 +- diff.c | 2 +- git-add--interactive.perl | 4 ++-- git-am.sh | 2 +- gitweb/gitweb.perl | 2 +- http.h | 4 ++-- perl/Git/SVN.pm | 6 +++--- perl/Git/SVN/Migration.pm | 2 +- pkt-line.h | 2 +- remote.c| 2 +- sha1_file.c | 4 ++-- t/t1001-read-tree-m-2way.sh | 2 +- t/t4005-diff-rename-2.sh| 2 +- t/t4009-diff-rename-4.sh| 2 +- t/t5304-prune.sh| 2 +- t/t6036-recursive-corner-cases.sh | 2 +- t/t7104-reset.sh| 2 +- t/t9400-git-cvsserver-server.sh | 2 +- test-chmtime.c | 2 +- 59 files changed, 88 insertions(+), 89 deletions(-) -- 1.9.0.279.gdc9e3eb -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/4] contrib: Fix misuses of "nor"
Signed-off-by: Justin Lebar --- 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 -- 1.9.0.279.gdc9e3eb -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/4] Fix misuses of "nor" in comments
Signed-off-by: Justin Lebar
---
Makefile| 2 +-
builtin/apply.c | 2 +-
builtin/checkout.c | 2 +-
builtin/log.c | 2 +-
builtin/pack-objects.c | 2 +-
builtin/reset.c | 4 ++--
builtin/show-branch.c | 2 +-
column.c| 2 +-
contrib/examples/git-checkout.sh| 2 +-
contrib/examples/git-reset.sh | 4 ++--
contrib/fast-import/import-directories.perl | 4 ++--
delta.h | 2 +-
diff.c | 2 +-
git-am.sh | 2 +-
gitweb/gitweb.perl | 2 +-
http.h | 4 ++--
perl/Git/SVN.pm | 2 +-
perl/Git/SVN/Migration.pm | 2 +-
pkt-line.h | 2 +-
remote.c| 2 +-
sha1_file.c | 2 +-
test-chmtime.c | 2 +-
22 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/Makefile b/Makefile
index dddaf4f..fc02788 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ all::
#
# Define NEEDS_LIBINTL_BEFORE_LIBICONV if you need libintl before libiconv.
#
-# Define NO_INTPTR_T if you don't have intptr_t nor uintptr_t.
+# Define NO_INTPTR_T if you don't have intptr_t or uintptr_t.
#
# Define NO_UINTMAX_T if you don't have uintmax_t.
#
diff --git a/builtin/apply.c b/builtin/apply.c
index b0d0986..6013e19 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -4061,7 +4061,7 @@ static int write_out_one_reject(struct patch *patch)
return error(_("cannot open %s: %s"), namebuf, strerror(errno));
/* Normal git tools never deal with .rej, so do not pretend
-* this is a git patch by saying --git nor give extended
+* this is a git patch by saying --git or giving extended
* headers. While at it, maybe please "kompare" that wants
* the trailing TAB and some garbage at the end of line ;-).
*/
diff --git a/builtin/checkout.c b/builtin/checkout.c
index ada51fa..7f37d1a 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -895,7 +895,7 @@ static int parse_branchname_arg(int argc, const char **argv,
* between A and B, A...B names that merge base.
*
* (b) If is _not_ a commit, either "--" is present
-* or is not a path, no -t nor -b was given, and
+* or is not a path, no -t or -b was given, and
* and there is a tracking branch whose name is
* in one and only one remote, then this is a short-hand to
* fork local from that remote-tracking branch.
diff --git a/builtin/log.c b/builtin/log.c
index b97373d..39e8836 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -503,7 +503,7 @@ static void show_rev_tweak_rev(struct rev_info *rev, struct
setup_revision_opt *
/* There was no "-m" on the command line */
rev->ignore_merges = 0;
if (!rev->first_parent_only && !rev->combine_merges) {
- /* No "--first-parent", "-c", nor "--cc" */
+ /* No "--first-parent", "-c", or "--cc" */
rev->combine_merges = 1;
rev->dense_combined_merges = 1;
}
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 541667f..ef1f20e 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -999,7 +999,7 @@ static int pbase_tree_cache_ix_incr(int ix)
static struct pbase_tree {
struct pbase_tree *next;
/* This is a phony "cache" entry; we are not
-* going to evict it nor find it through _get()
+* going to evict it or find it through _get()
* mechanism -- this is for the toplevel node that
* would almost always change with any commit.
*/
diff --git a/builtin/reset.c b/builtin/reset.c
index a991344..96dd4c9 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -309,7 +309,7 @@ int cmd_reset(int argc, const char **argv, const char
*prefix)
/* git reset tree [--] paths... can be used to
* load chosen paths from the tree into the index without
-* affecting the working tree nor HEAD. */
+* affecting the working tree or HEAD. */
if (pathspec.nr) {
if (reset_type == MIXED)
warning(_("--mixed with paths is deprecated; use 'git
reset -- ' instead."));
@@ -327,7 +327,7 @@ int cmd_reset(int argc, const char **argv, const char
*prefix)
[PATCH 1/4] Documentation: Fix misuses of "nor"
Signed-off-by: Justin Lebar
---
Documentation/CodingGuidelines | 4 ++--
Documentation/config.txt| 6 +++---
Documentation/diff-generate-patch.txt | 2 +-
Documentation/diff-options.txt | 2 +-
Documentation/everyday.txt | 2 +-
Documentation/git-add.txt | 4 ++--
Documentation/git-count-objects.txt | 4 ++--
Documentation/git-diff.txt | 4 ++--
Documentation/git-prune.txt | 2 +-
Documentation/git-push.txt | 2 +-
Documentation/git-read-tree.txt | 2 +-
Documentation/git-reset.txt | 6 +++---
Documentation/git-show-branch.txt | 2 +-
Documentation/git-show-ref.txt | 2 +-
Documentation/howto/rebase-from-internal-branch.txt | 2 +-
Documentation/howto/revert-a-faulty-merge.txt | 4 ++--
Documentation/howto/revert-branch-rebase.txt| 2 +-
Documentation/merge-options.txt | 15 +++
Documentation/pretty-formats.txt| 2 +-
Documentation/pretty-options.txt| 2 +-
Documentation/rev-list-options.txt | 2 +-
Documentation/technical/api-gitattributes.txt | 2 +-
Documentation/technical/pack-protocol.txt | 8
Documentation/technical/protocol-common.txt | 2 +-
Documentation/user-manual.txt | 2 +-
25 files changed, 43 insertions(+), 44 deletions(-)
diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index ef67b53..b99fa87 100644
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -91,13 +91,13 @@ For shell scripts specifically (not exhaustive):
E.g.: my_function () {
- As to use of grep, stick to a subset of BRE (namely, no \{m,n\},
- [::], [==], nor [..]) for portability.
+ [::], [==], or [..]) for portability.
- We do not use \{m,n\};
- We do not use -E;
- - We do not use ? nor + (which are \{0,1\} and \{1,\}
+ - We do not use ? or + (which are \{0,1\} and \{1,\}
respectively in BRE) but that goes without saying as these
are ERE elements not BRE (note that \? and \+ are not even part
of BRE -- making them accessible from BRE is a GNU extension).
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 5f4d793..c26a7c8 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -78,8 +78,8 @@ be escaped: use `\"` for `"` and `\\` for `\`.
The following escape sequences (beside `\"` and `\\`) are recognized:
`\n` for newline character (NL), `\t` for horizontal tabulation (HT, TAB)
-and `\b` for backspace (BS). No other char escape sequence, nor octal
-char sequences are valid.
+and `\b` for backspace (BS). Other char escape sequences (including octal
+escape sequences) are invalid.
Variable values ending in a `\` are continued on the next line in the
customary UNIX fashion.
@@ -827,7 +827,7 @@ color.diff::
commands will only use color when output is to the terminal.
Defaults to false.
+
-This does not affect linkgit:git-format-patch[1] nor the
+This does not affect linkgit:git-format-patch[1] or the
'git-diff-{asterisk}' plumbing commands. Can be overridden on the
command line with the `--color[=]` option.
diff --git a/Documentation/diff-generate-patch.txt
b/Documentation/diff-generate-patch.txt
index 55f499a..843a20b 100644
--- a/Documentation/diff-generate-patch.txt
+++ b/Documentation/diff-generate-patch.txt
@@ -174,7 +174,7 @@ added, from the point of view of that parent).
In the above example output, the function signature was changed
from both files (hence two `-` removals from both file1 and
file2, plus `++` to mean one line that was added does not appear
-in either file1 nor file2). Also eight other lines are the same
+in either file1 or file2). Also eight other lines are the same
from file1 but do not appear in file2 (hence prefixed with `+`).
When shown by `git diff-tree -c`, it compares the parents of a
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 9b37b2a..6cb083a 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -358,7 +358,7 @@ endif::git-log[]
--irreversible-delete::
Omit the preimage for deletes, i.e. print only the header but not
the diff between the preimage and `/dev/null`. The resulting patch
- is not meant to be applied with `patch` nor `git apply`; this is
+ is not meant to be applied with `patch` or `git apply`; this is
solely for people who want to just concentrate on reviewing the
text after the change. In addition, the output obviously lack
enough information to apply such a patch in reverse, ev
Re: [PATCH 3/6] l10n: Fix misuses of "nor"
Thanks. I'll remove this patch from the queue. On Sun, Mar 16, 2014 at 6:45 PM, Jiang Xin wrote: > 2014-03-15 16:41 GMT+08:00 Justin Lebar : >> Signed-off-by: Justin Lebar >> --- >> po/bg.po| 6 +++--- >> po/de.po| 6 +++--- >> po/fr.po| 6 +++--- >> po/git.pot | 6 +++--- >> po/it.po| 2 +- >> po/pt_PT.po | 2 +- >> po/sv.po| 6 +++--- >> po/vi.po| 6 +++--- >> po/zh_CN.po | 6 +++--- >> 9 files changed, 23 insertions(+), 23 deletions(-) >> >> diff --git a/po/bg.po b/po/bg.po >> index fb450b2..983e575 100644 >> --- a/po/bg.po >> +++ b/po/bg.po >> @@ -3699,13 +3699,13 @@ msgstr "" >> >> #: builtin/clean.c:906 >> msgid "" >> -"clean.requireForce set to true and neither -i, -n nor -f given; refusing >> to " >> +"clean.requireForce set to true and neither -i, -n, nor -f given; refusing >> to " >> "clean" >> msgstr "" >> > > Hi Justin, > > All the msgids you patched are extracted from Git source code using gettext, > So please patch the original files where the msgids are came from, such as > builtin/clean.c. > > > -- > Jiang Xin -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 0/6] Fix misuses of "nor"
> I guess I'm cc'd because I made a few of those or/nor mistakes. I actually didn't look that closely at the blame; I cc'ed you because you were a top contributor in a few of the directories I was touching. > I suggest that you merge "Fix misuses of "nor" outside comments" > and "Tests: Fix muses of "nor"" into one. Otherwise you break the test > suite at 5/6 Sure thing, will do. There's a similar incompatibility with the l10n change and "Fix misuses of "nor" outside comments": The former references strings changed in the latter. Should I merge these, or should I enforce a particular ordering between these patches? (Right now the l10n patch comes before the string changes in the code, but that's probably wrong now that I think about it.) > Being a non-native English speaker I'm not really qualified to review this. FWIW even being a native English speaker I was unsure about a few of the changes myself. This caused me to finally break down and order Garner's Modern American Usage, which I hope will reveal all. :) -Justin On Sat, Mar 15, 2014 at 1:56 AM, Duy Nguyen wrote: > On Sat, Mar 15, 2014 at 3:41 PM, Justin Lebar wrote: >> I got annoyed by git's awkward use of "nor" in man pages and in git add -p, >> so >> I went ahead and audited all uses of "nor" in the tree. One might be able to >> argue that some of the uses I've changed are technically acceptable, but >> that's >> a pretty low bar to set for ourselves. I aimed to make everything both >> correct >> and idiomatic. > > I guess I'm cc'd because I made a few of those or/nor mistakes. Being > a non-native English speaker I'm not really qualified to review this. > But I suggest that you merge "Fix misuses of "nor" outside comments" > and "Tests: Fix muses of "nor"" into one. Otherwise you break the test > suite at 5/6 (and 6/6 fixes it, but breaking the test suite at any > commit is not very bisect-friendly). > -- > Duy -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 5/6] Fix misuses of "nor" outside comments
Signed-off-by: Justin Lebar
---
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, <http://vger.kernel.org/majordomo-info.html
[PATCH 6/6] Tests: Fix misuses of "nor"
Signed-off-by: Justin Lebar --- t/t1001-read-tree-m-2way.sh | 2 +- t/t4005-diff-rename-2.sh | 2 +- t/t4009-diff-rename-4.sh | 2 +- t/t5304-prune.sh | 2 +- t/t6036-recursive-corner-cases.sh | 2 +- t/t7104-reset.sh | 2 +- t/t9400-git-cvsserver-server.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh index acaab07..1731383 100755 --- a/t/t1001-read-tree-m-2way.sh +++ b/t/t1001-read-tree-m-2way.sh @@ -18,7 +18,7 @@ In the test, these paths are used: frotz - not in H added in M nitfol - in H, stays in M unmodified rezrov - in H, deleted in M -yomin - not in H nor M +yomin - not in H or M ' . ./test-lib.sh . "$TEST_DIRECTORY"/lib-read-tree.sh diff --git a/t/t4005-diff-rename-2.sh b/t/t4005-diff-rename-2.sh index 77d7f49..7d2c6e1 100755 --- a/t/t4005-diff-rename-2.sh +++ b/t/t4005-diff-rename-2.sh @@ -66,7 +66,7 @@ test_expect_success \ # tree has COPYING and rezrov. work tree has the same COPYING and # copy-edited COPYING.1, and unchanged rezrov. We should not say -# anything about rezrov nor COPYING, since the revised again diff-raw +# anything about rezrov or COPYING, since the revised again diff-raw # nows how to say Copy. test_expect_success \ diff --git a/t/t4009-diff-rename-4.sh b/t/t4009-diff-rename-4.sh index f22c8e3..57c094f 100755 --- a/t/t4009-diff-rename-4.sh +++ b/t/t4009-diff-rename-4.sh @@ -73,7 +73,7 @@ test_expect_success \ # tree has COPYING and rezrov. work tree has the same COPYING and # copy-edited COPYING.1, and unchanged rezrov. We should not say -# anything about rezrov nor COPYING, since the revised again diff-raw +# anything about rezrov or COPYING, since the revised again diff-raw # nows how to say Copy. test_expect_success \ diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh index 66c9a41..377d3d3 100755 --- a/t/t5304-prune.sh +++ b/t/t5304-prune.sh @@ -213,7 +213,7 @@ test_expect_success 'garbage report in count-objects -v' ' warning: garbage found: .git/objects/pack/fake.bar warning: garbage found: .git/objects/pack/foo warning: garbage found: .git/objects/pack/foo.bar -warning: no corresponding .idx nor .pack: .git/objects/pack/fake2.keep +warning: no corresponding .idx or .pack: .git/objects/pack/fake2.keep warning: no corresponding .idx: .git/objects/pack/foo.keep warning: no corresponding .idx: .git/objects/pack/foo.pack warning: no corresponding .pack: .git/objects/pack/fake3.idx diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh index dfee7d1..a86087b 100755 --- a/t/t6036-recursive-corner-cases.sh +++ b/t/t6036-recursive-corner-cases.sh @@ -388,7 +388,7 @@ test_expect_failure 'git detects conflict w/ criss-cross+contrived resolution' ' # # criss-cross + d/f conflict via add/add: -# Commit A: Neither file 'a' nor directory 'a/' exist. +# Commit A: Neither file 'a' nor directory 'a/' exists. # Commit B: Introduce 'a' # Commit C: Introduce 'a/file' # Commit D: Merge B & C, keeping 'a' and deleting 'a/' diff --git a/t/t7104-reset.sh b/t/t7104-reset.sh index f136ee7..16faa07 100755 --- a/t/t7104-reset.sh +++ b/t/t7104-reset.sh @@ -33,7 +33,7 @@ test_expect_success 'reset --hard should restore unmerged ones' ' ' -test_expect_success 'reset --hard did not corrupt index nor cached-tree' ' +test_expect_success 'reset --hard did not corrupt index or cached-tree' ' T=$(git write-tree) && rm -f .git/index && diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh index 3edc408..1f06e25 100755 --- a/t/t9400-git-cvsserver-server.sh +++ b/t/t9400-git-cvsserver-server.sh @@ -512,7 +512,7 @@ test_expect_success 'cvs co -c (shows module database)' ' # Known issues with git-cvsserver current log output: # - Hard coded "lines: +2 -3" placeholder, instead of real numbers. # - CVS normally does not internally add a blank first line -#nor a last line with nothing but a space to log messages. +#or a last line with nothing but a space to log messages. # - The latest cvs 1.12.x server sends + timezone (with some hidden "MT" #tagging in the protocol), and if cvs 1.12.x client sees the MT tags, #it converts to local time zone. git-cvsserver doesn't do the + -- 1.9.0.279.gdc9e3eb -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/6] Documentation: Fix misuses of "nor"
Signed-off-by: Justin Lebar
---
Documentation/CodingGuidelines | 4 ++--
Documentation/config.txt| 6 +++---
Documentation/diff-generate-patch.txt | 2 +-
Documentation/diff-options.txt | 2 +-
Documentation/everyday.txt | 2 +-
Documentation/git-add.txt | 4 ++--
Documentation/git-count-objects.txt | 4 ++--
Documentation/git-diff.txt | 4 ++--
Documentation/git-prune.txt | 2 +-
Documentation/git-push.txt | 2 +-
Documentation/git-read-tree.txt | 2 +-
Documentation/git-reset.txt | 6 +++---
Documentation/git-show-branch.txt | 2 +-
Documentation/git-show-ref.txt | 2 +-
Documentation/howto/rebase-from-internal-branch.txt | 2 +-
Documentation/howto/revert-a-faulty-merge.txt | 4 ++--
Documentation/howto/revert-branch-rebase.txt| 2 +-
Documentation/merge-options.txt | 15 +++
Documentation/pretty-formats.txt| 2 +-
Documentation/pretty-options.txt| 2 +-
Documentation/rev-list-options.txt | 2 +-
Documentation/technical/api-gitattributes.txt | 2 +-
Documentation/technical/pack-protocol.txt | 8
Documentation/technical/protocol-common.txt | 2 +-
Documentation/user-manual.txt | 2 +-
25 files changed, 43 insertions(+), 44 deletions(-)
diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index ef67b53..b99fa87 100644
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -91,13 +91,13 @@ For shell scripts specifically (not exhaustive):
E.g.: my_function () {
- As to use of grep, stick to a subset of BRE (namely, no \{m,n\},
- [::], [==], nor [..]) for portability.
+ [::], [==], or [..]) for portability.
- We do not use \{m,n\};
- We do not use -E;
- - We do not use ? nor + (which are \{0,1\} and \{1,\}
+ - We do not use ? or + (which are \{0,1\} and \{1,\}
respectively in BRE) but that goes without saying as these
are ERE elements not BRE (note that \? and \+ are not even part
of BRE -- making them accessible from BRE is a GNU extension).
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 5f4d793..c26a7c8 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -78,8 +78,8 @@ be escaped: use `\"` for `"` and `\\` for `\`.
The following escape sequences (beside `\"` and `\\`) are recognized:
`\n` for newline character (NL), `\t` for horizontal tabulation (HT, TAB)
-and `\b` for backspace (BS). No other char escape sequence, nor octal
-char sequences are valid.
+and `\b` for backspace (BS). Other char escape sequences (including octal
+escape sequences) are invalid.
Variable values ending in a `\` are continued on the next line in the
customary UNIX fashion.
@@ -827,7 +827,7 @@ color.diff::
commands will only use color when output is to the terminal.
Defaults to false.
+
-This does not affect linkgit:git-format-patch[1] nor the
+This does not affect linkgit:git-format-patch[1] or the
'git-diff-{asterisk}' plumbing commands. Can be overridden on the
command line with the `--color[=]` option.
diff --git a/Documentation/diff-generate-patch.txt
b/Documentation/diff-generate-patch.txt
index 55f499a..843a20b 100644
--- a/Documentation/diff-generate-patch.txt
+++ b/Documentation/diff-generate-patch.txt
@@ -174,7 +174,7 @@ added, from the point of view of that parent).
In the above example output, the function signature was changed
from both files (hence two `-` removals from both file1 and
file2, plus `++` to mean one line that was added does not appear
-in either file1 nor file2). Also eight other lines are the same
+in either file1 or file2). Also eight other lines are the same
from file1 but do not appear in file2 (hence prefixed with `+`).
When shown by `git diff-tree -c`, it compares the parents of a
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 9b37b2a..6cb083a 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -358,7 +358,7 @@ endif::git-log[]
--irreversible-delete::
Omit the preimage for deletes, i.e. print only the header but not
the diff between the preimage and `/dev/null`. The resulting patch
- is not meant to be applied with `patch` nor `git apply`; this is
+ is not meant to be applied with `patch` or `git apply`; this is
solely for people who want to just concentrate on reviewing the
text after the change. In addition, the output obviously lack
enough information to apply such a patch in reverse, ev
[PATCH 3/6] l10n: Fix misuses of "nor"
Signed-off-by: Justin Lebar --- po/bg.po| 6 +++--- po/de.po| 6 +++--- po/fr.po| 6 +++--- po/git.pot | 6 +++--- po/it.po| 2 +- po/pt_PT.po | 2 +- po/sv.po| 6 +++--- po/vi.po| 6 +++--- po/zh_CN.po | 6 +++--- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/po/bg.po b/po/bg.po index fb450b2..983e575 100644 --- a/po/bg.po +++ b/po/bg.po @@ -3699,13 +3699,13 @@ msgstr "" #: builtin/clean.c:906 msgid "" -"clean.requireForce set to true and neither -i, -n nor -f given; refusing to " +"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" #: builtin/clean.c:909 msgid "" -"clean.requireForce defaults to true and neither -i, -n nor -f given; " +"clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" @@ -4253,7 +4253,7 @@ msgid "Clever... amending the last one with dirty index." msgstr "" #: builtin/commit.c:1126 -msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" #: builtin/commit.c:1136 builtin/tag.c:572 diff --git a/po/de.po b/po/de.po index b777ef4..f539bf5 100644 --- a/po/de.po +++ b/po/de.po @@ -3876,7 +3876,7 @@ msgstr "Die Optionen -x und -X können nicht gemeinsam verwendet werden." #: builtin/clean.c:906 msgid "" -"clean.requireForce set to true and neither -i, -n nor -f given; refusing to " +"clean.requireForce set to true and neither -i, -n, or -f given; refusing to " "clean" msgstr "" "clean.requireForce auf \"true\" gesetzt und weder -i, -n noch -f gegeben; " @@ -3884,7 +3884,7 @@ msgstr "" #: builtin/clean.c:909 msgid "" -"clean.requireForce defaults to true and neither -i, -n nor -f given; " +"clean.requireForce defaults to true and neither -i, -n, or -f given; " "refusing to clean" msgstr "" "clean.requireForce standardmäßig auf \"true\" gesetzt und weder -i, -n noch -" @@ -4496,7 +4496,7 @@ msgstr "" "Klug... den letzten Commit mit einer geänderten Staging-Area nachbessern." #: builtin/commit.c:1126 -msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" "Explizite Pfade ohne -i oder -o angegeben; unter der Annahme von --only " "Pfaden..." diff --git a/po/fr.po b/po/fr.po index 0b9d59e..9683264 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3917,7 +3917,7 @@ msgstr "-x et -X ne peuvent pas être utilisés ensemble" #: builtin/clean.c:906 msgid "" -"clean.requireForce set to true and neither -i, -n nor -f given; refusing to " +"clean.requireForce set to true and neither -i, -n, or -f given; refusing to " "clean" msgstr "" "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de " @@ -3925,7 +3925,7 @@ msgstr "" #: builtin/clean.c:909 msgid "" -"clean.requireForce defaults to true and neither -i, -n nor -f given; " +"clean.requireForce defaults to true and neither -i, -n, or -f given; " "refusing to clean" msgstr "" "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de " @@ -4526,7 +4526,7 @@ msgid "Clever... amending the last one with dirty index." msgstr "Malin... correction du dernier avec un index sale." #: builtin/commit.c:1126 -msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..." #: builtin/commit.c:1136 builtin/tag.c:572 diff --git a/po/git.pot b/po/git.pot index 33cc31d..3553bfc 100644 --- a/po/git.pot +++ b/po/git.pot @@ -3598,13 +3598,13 @@ msgstr "" #: builtin/clean.c:906 msgid "" -"clean.requireForce set to true and neither -i, -n nor -f given; refusing to " +"clean.requireForce set to true and neither -i, -n, or -f given; refusing to " "clean" msgstr "" #: builtin/clean.c:909 msgid "" -"clean.requireForce defaults to true and neither -i, -n nor -f given; " +"clean.requireForce defaults to true and neither -i, -n, or -f given; " "refusing to clean" msgstr "" @@ -4150,7 +4150,7 @@ msgid "Clever... amending the last one with dirty index." msgstr "" #:
[PATCH 2/6] contrib: Fix misuses of "nor"
Signed-off-by: Justin Lebar --- 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 -- 1.9.0.279.gdc9e3eb -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 4/6] Fix misuses of "nor" in comments
Signed-off-by: Justin Lebar
---
Makefile| 2 +-
builtin/apply.c | 2 +-
builtin/checkout.c | 2 +-
builtin/log.c | 2 +-
builtin/pack-objects.c | 2 +-
builtin/reset.c | 4 ++--
builtin/show-branch.c | 2 +-
column.c| 2 +-
contrib/examples/git-checkout.sh| 2 +-
contrib/examples/git-reset.sh | 4 ++--
contrib/fast-import/import-directories.perl | 4 ++--
delta.h | 2 +-
diff.c | 2 +-
git-am.sh | 2 +-
gitweb/gitweb.perl | 2 +-
http.h | 4 ++--
perl/Git/SVN.pm | 2 +-
perl/Git/SVN/Migration.pm | 2 +-
pkt-line.h | 2 +-
remote.c| 2 +-
sha1_file.c | 2 +-
test-chmtime.c | 2 +-
22 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/Makefile b/Makefile
index dddaf4f..fc02788 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ all::
#
# Define NEEDS_LIBINTL_BEFORE_LIBICONV if you need libintl before libiconv.
#
-# Define NO_INTPTR_T if you don't have intptr_t nor uintptr_t.
+# Define NO_INTPTR_T if you don't have intptr_t or uintptr_t.
#
# Define NO_UINTMAX_T if you don't have uintmax_t.
#
diff --git a/builtin/apply.c b/builtin/apply.c
index b0d0986..6013e19 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -4061,7 +4061,7 @@ static int write_out_one_reject(struct patch *patch)
return error(_("cannot open %s: %s"), namebuf, strerror(errno));
/* Normal git tools never deal with .rej, so do not pretend
-* this is a git patch by saying --git nor give extended
+* this is a git patch by saying --git or giving extended
* headers. While at it, maybe please "kompare" that wants
* the trailing TAB and some garbage at the end of line ;-).
*/
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 5df3837..ec21b13 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -896,7 +896,7 @@ static int parse_branchname_arg(int argc, const char **argv,
* between A and B, A...B names that merge base.
*
* (b) If is _not_ a commit, either "--" is present
-* or is not a path, no -t nor -b was given, and
+* or is not a path, no -t or -b was given, and
* and there is a tracking branch whose name is
* in one and only one remote, then this is a short-hand to
* fork local from that remote-tracking branch.
diff --git a/builtin/log.c b/builtin/log.c
index b97373d..39e8836 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -503,7 +503,7 @@ static void show_rev_tweak_rev(struct rev_info *rev, struct
setup_revision_opt *
/* There was no "-m" on the command line */
rev->ignore_merges = 0;
if (!rev->first_parent_only && !rev->combine_merges) {
- /* No "--first-parent", "-c", nor "--cc" */
+ /* No "--first-parent", "-c", or "--cc" */
rev->combine_merges = 1;
rev->dense_combined_merges = 1;
}
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 541667f..ef1f20e 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -999,7 +999,7 @@ static int pbase_tree_cache_ix_incr(int ix)
static struct pbase_tree {
struct pbase_tree *next;
/* This is a phony "cache" entry; we are not
-* going to evict it nor find it through _get()
+* going to evict it or find it through _get()
* mechanism -- this is for the toplevel node that
* would almost always change with any commit.
*/
diff --git a/builtin/reset.c b/builtin/reset.c
index 6004803..ef3249e 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -309,7 +309,7 @@ int cmd_reset(int argc, const char **argv, const char
*prefix)
/* git reset tree [--] paths... can be used to
* load chosen paths from the tree into the index without
-* affecting the working tree nor HEAD. */
+* affecting the working tree or HEAD. */
if (pathspec.nr) {
if (reset_type == MIXED)
warning(_("--mixed with paths is deprecated; use 'git
reset -- ' instead."));
@@ -327,7 +327,7 @@ int cmd_reset(int argc, const char **argv, const char
*prefix)
[PATCH 0/6] Fix misuses of "nor"
I got annoyed by git's awkward use of "nor" in man pages and in git add -p, so I went ahead and audited all uses of "nor" in the tree. One might be able to argue that some of the uses I've changed are technically acceptable, but that's a pretty low bar to set for ourselves. I aimed to make everything both correct and idiomatic. All I really care about is git-add--interactive.perl and (to a lesser extent) the docs, so if any of these other changes are controversial or annoying to take, I'm happy to drop them. This is my first patch to git, so I've probably made a few fatal errors in how I packaged this change; apologies in advance. Justin Lebar (6): Documentation: Fix misuses of "nor" contrib: Fix misuses of "nor" l10n: Fix misuses of "nor" Fix misuses of "nor" in comments Fix misuses of "nor" outside comments Tests: Fix misuses of "nor" Documentation/CodingGuidelines | 4 ++-- Documentation/config.txt| 6 +++--- Documentation/diff-generate-patch.txt | 2 +- Documentation/diff-options.txt | 2 +- Documentation/everyday.txt | 2 +- Documentation/git-add.txt | 4 ++-- Documentation/git-count-objects.txt | 4 ++-- Documentation/git-diff.txt | 4 ++-- Documentation/git-prune.txt | 2 +- Documentation/git-push.txt | 2 +- Documentation/git-read-tree.txt | 2 +- Documentation/git-reset.txt | 6 +++--- Documentation/git-show-branch.txt | 2 +- Documentation/git-show-ref.txt | 2 +- Documentation/howto/rebase-from-internal-branch.txt | 2 +- Documentation/howto/revert-a-faulty-merge.txt | 4 ++-- Documentation/howto/revert-branch-rebase.txt| 2 +- Documentation/merge-options.txt | 15 +++ Documentation/pretty-formats.txt| 2 +- Documentation/pretty-options.txt| 2 +- Documentation/rev-list-options.txt | 2 +- Documentation/technical/api-gitattributes.txt | 2 +- Documentation/technical/pack-protocol.txt | 8 Documentation/technical/protocol-common.txt | 2 +- Documentation/user-manual.txt | 2 +- Makefile| 2 +- builtin/apply.c | 2 +- builtin/checkout.c | 2 +- builtin/clean.c | 6 +++--- builtin/commit.c| 2 +- builtin/log.c | 2 +- builtin/pack-objects.c | 2 +- builtin/reset.c | 4 ++-- builtin/show-branch.c | 2 +- column.c| 2 +- contrib/examples/git-checkout.sh| 2 +- contrib/examples/git-commit.sh | 2 +- contrib/examples/git-reset.sh | 4 ++-- contrib/fast-import/import-directories.perl | 4 ++-- contrib/svn-fe/svn-fe.txt | 4 ++-- delta.h | 2 +- diff.c | 2 +- git-add--interactive.perl | 4 ++-- git-am.sh | 2 +- gitweb/gitweb.perl | 2 +- http.h | 4 ++-- perl/Git/SVN.pm | 6 +++--- perl/Git/SVN/Migration.pm | 2 +- pkt-line.h | 2 +- po/bg.po| 6 +++--- po/de.po| 6 +++--- po/fr.po| 6 +++--- po/git.pot | 6 +++--- po/it.po| 2 +- po/pt_PT.po | 2 +- po/sv.po| 6 +++--- po/vi.po| 6 +++--- po/zh_CN.po | 6 +++--- remote.c| 2 +- sha1_file.c | 4 ++-- t/t1001-read-tree-m-2way.sh | 2 +- t/t4005-diff-rename-2.sh| 2 +- t/t4009-diff-rename-4.sh| 2 +- t/t5304-prune.sh| 2 +- t/t6036-recursive-corner-cas
