* [PATCH 1/4] Documentation: Fix misuses of "nor"
2014-03-20 22:16 [PATCH 0/4] Fix misuses of "nor" (v2) Justin Lebar
@ 2014-03-20 22:16 ` Justin Lebar
2014-03-20 22:16 ` [PATCH 2/4] contrib: " Justin Lebar
` (2 subsequent siblings)
3 siblings, 0 replies; 11+ messages in thread
From: Justin Lebar @ 2014-03-20 22:16 UTC (permalink / raw)
To: git; +Cc: Justin Lebar, Jeff King, Jonathan Nieder
Signed-off-by: Justin Lebar <jlebar@google.com>
---
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[=<when>]` 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, even manually,
diff --git a/Documentation/everyday.txt b/Documentation/everyday.txt
index 2a18c1f..b2548ef 100644
--- a/Documentation/everyday.txt
+++ b/Documentation/everyday.txt
@@ -263,7 +263,7 @@ that are not quite ready.
<5> create topic branch as needed and apply, again with my
sign-offs.
<6> rebase internal topic branch that has not been merged to the
-master, nor exposed as a part of a stable branch.
+master or exposed as a part of a stable branch.
<7> restart `pu` every time from the next.
<8> and bundle topic branches still cooking.
<9> backport a critical fix.
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 48754cb..f3ab374 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -296,9 +296,9 @@ patch::
y - stage this hunk
n - do not stage this hunk
- q - quit; do not stage this hunk nor any of the remaining ones
+ q - quit; do not stage this hunk or any of the remaining ones
a - stage this hunk and all later hunks in the file
- d - do not stage this hunk nor any of the later hunks in the file
+ d - do not stage 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/Documentation/git-count-objects.txt b/Documentation/git-count-objects.txt
index b300e84..2ff3568 100644
--- a/Documentation/git-count-objects.txt
+++ b/Documentation/git-count-objects.txt
@@ -33,8 +33,8 @@ size-pack: disk space consumed by the packs, in KiB (unless -H is specified)
prune-packable: the number of loose objects that are also present in
the packs. These objects could be pruned using `git prune-packed`.
+
-garbage: the number of files in object database that are not valid
-loose objects nor valid packs
+garbage: the number of files in object database that are neither valid loose
+objects nor valid packs
+
size-garbage: disk space consumed by garbage files, in KiB (unless -H is
specified)
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index 56fb7e5..bbab35f 100644
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -158,8 +158,8 @@ $ git diff --name-status <2>
$ git diff arch/i386 include/asm-i386 <3>
------------
+
-<1> Show only modification, rename and copy, but not addition
-nor deletion.
+<1> Show only modification, rename, and copy, but not addition
+or deletion.
<2> Show only names and the nature of change, but not actual
diff output.
<3> Limit diff output to named subtrees.
diff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt
index 058ac0d..7a493c8 100644
--- a/Documentation/git-prune.txt
+++ b/Documentation/git-prune.txt
@@ -56,7 +56,7 @@ OPTIONS
EXAMPLE
-------
-To prune objects not used by your repository nor another that
+To prune objects not used by your repository or another that
borrows from your repository via its
`.git/objects/info/alternates`:
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 2b7f4f9..d0b9e2f 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -385,7 +385,7 @@ will now start building on top of B.
The command by default does not allow an update that is not a fast-forward
to prevent such loss of history.
-If you do not want to lose your work (history from X to B) nor the work by
+If you do not want to lose your work (history from X to B) or the work by
the other person (history from X to A), you would need to first fetch the
history from the repository, create a history that contains changes done
by both parties, and push the result back.
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index c4bde65..056c0db 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -57,7 +57,7 @@ OPTIONS
-n::
--dry-run::
Check if the command would error out, without updating the index
- nor the files in the working tree for real.
+ or the files in the working tree for real.
-v::
Show the progress of checking files out.
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index f445cb3..24bf4d5 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -21,7 +21,7 @@ to HEAD in all forms.
'git reset' [-q] [<tree-ish>] [--] <paths>...::
This form resets the index entries for all <paths> to their
- state at <tree-ish>. (It does not affect the working tree, nor
+ state at <tree-ish>. (It does not affect the working tree or
the current branch.)
+
This means that `git reset <paths>` is the opposite of `git add
@@ -51,7 +51,7 @@ section of linkgit:git-add[1] to learn how to operate the `--patch` mode.
+
--
--soft::
- Does not touch the index file nor the working tree at all (but
+ Does not touch the index file or the working tree at all (but
resets the head to <commit>, just like all modes do). This leaves
all your changed files "Changes to be committed", as 'git status'
would put it.
@@ -115,7 +115,7 @@ and changes with these files are distracting.
<2> Somebody asks you to pull, and the changes sounds worthy of merging.
<3> However, you already dirtied the index (i.e. your index does
not match the HEAD commit). But you know the pull you are going
-to make does not affect frotz.c nor filfre.c, so you revert the
+to make does not affect frotz.c or filfre.c, so you revert the
index changes for these two files. Your changes in working tree
remain there.
<4> Then you can pull and merge, leaving frotz.c and filfre.c
diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index a515648..b91d4e5 100644
--- a/Documentation/git-show-branch.txt
+++ b/Documentation/git-show-branch.txt
@@ -25,7 +25,7 @@ and/or refs/tags) semi-visually.
It cannot show more than 29 branches and commits at a time.
It uses `showbranch.default` multi-valued configuration items if
-no <rev> nor <glob> is given on the command line.
+no <rev> or <glob> is given on the command line.
OPTIONS
diff --git a/Documentation/git-show-ref.txt b/Documentation/git-show-ref.txt
index ffd1b03..2a6f89b 100644
--- a/Documentation/git-show-ref.txt
+++ b/Documentation/git-show-ref.txt
@@ -89,7 +89,7 @@ OPTIONS
Show references matching one or more patterns. Patterns are matched from
the end of the full name, and only complete parts are matched, e.g.
'master' matches 'refs/heads/master', 'refs/remotes/origin/master',
- 'refs/tags/jedi/master' but not 'refs/heads/mymaster' nor
+ 'refs/tags/jedi/master' but not 'refs/heads/mymaster' or
'refs/remotes/master/jedi'.
OUTPUT
diff --git a/Documentation/howto/rebase-from-internal-branch.txt b/Documentation/howto/rebase-from-internal-branch.txt
index 19ab604..02cb5f7 100644
--- a/Documentation/howto/rebase-from-internal-branch.txt
+++ b/Documentation/howto/rebase-from-internal-branch.txt
@@ -139,7 +139,7 @@ You fetch from upstream, but not merge.
$ git fetch upstream
This leaves the updated upstream head in .git/FETCH_HEAD but
-does not touch your .git/HEAD nor .git/refs/heads/master.
+does not touch your .git/HEAD or .git/refs/heads/master.
You run "git rebase" now.
$ git rebase FETCH_HEAD master
diff --git a/Documentation/howto/revert-a-faulty-merge.txt b/Documentation/howto/revert-a-faulty-merge.txt
index acf3e47..462255e 100644
--- a/Documentation/howto/revert-a-faulty-merge.txt
+++ b/Documentation/howto/revert-a-faulty-merge.txt
@@ -54,7 +54,7 @@ where C and D are to fix what was broken in A and B, and you may already
have some other changes on the mainline after W.
If you merge the updated side branch (with D at its tip), none of the
-changes made in A nor B will be in the result, because they were reverted
+changes made in A or B will be in the result, because they were reverted
by W. That is what Alan saw.
Linus explains the situation:
@@ -90,7 +90,7 @@ with:
$ git revert W
This history would (ignoring possible conflicts between what W and W..Y
-changed) be equivalent to not having W nor Y at all in the history:
+changed) be equivalent to not having W or Y at all in the history:
---o---o---o---M---x---x-------x----
/
diff --git a/Documentation/howto/revert-branch-rebase.txt b/Documentation/howto/revert-branch-rebase.txt
index 85f69db..149508e 100644
--- a/Documentation/howto/revert-branch-rebase.txt
+++ b/Documentation/howto/revert-branch-rebase.txt
@@ -137,7 +137,7 @@ $ make clean test ;# make sure it did not cause other breakage.
------------------------------------------------
Everything is in the good order. I do not need the temporary branch
-nor tag anymore, so remove them:
+or tag anymore, so remove them:
------------------------------------------------
$ rm -f .git/refs/tags/pu-anchor
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index e134315..f08e9b8 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -63,14 +63,13 @@ merge.
--squash::
--no-squash::
- Produce the working tree and index state as if a real
- merge happened (except for the merge information),
- but do not actually make a commit or
- move the `HEAD`, nor record `$GIT_DIR/MERGE_HEAD` to
- cause the next `git commit` command to create a merge
- commit. This allows you to create a single commit on
- top of the current branch whose effect is the same as
- merging another branch (or more in case of an octopus).
+ Produce the working tree and index state as if a real merge
+ happened (except for the merge information), but do not actually
+ make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD`
+ (to cause the next `git commit` command to create a merge
+ commit). This allows you to create a single commit on top of
+ the current branch whose effect is the same as merging another
+ branch (or more in case of an octopus).
+
With --no-squash perform the merge and commit the result. This
option can be used to override --squash.
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 1d174fd..85d6353 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -78,7 +78,7 @@ The 'raw' format shows the entire commit exactly as
stored in the commit object. Notably, the SHA-1s are
displayed in full, regardless of whether --abbrev or
--no-abbrev are used, and 'parents' information show the
-true parent commits, without taking grafts nor history
+true parent commits, without taking grafts or history
simplification into account.
* 'format:<string>'
diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt
index eea0e30..8569e29 100644
--- a/Documentation/pretty-options.txt
+++ b/Documentation/pretty-options.txt
@@ -39,7 +39,7 @@ people using 80-column terminals.
Show the notes (see linkgit:git-notes[1]) that annotate the
commit, when showing the commit log message. This is the default
for `git log`, `git show` and `git whatchanged` commands when
- there is no `--pretty`, `--format` nor `--oneline` option given
+ there is no `--pretty`, `--format`, or `--oneline` option given
on the command line.
+
By default, the notes shown are from the notes refs listed in the
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 03533af..47c8dcc 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -237,7 +237,7 @@ list.
reflog entries from the most recent one to older ones.
When this option is used you cannot specify commits to
exclude (that is, '{caret}commit', 'commit1..commit2',
- nor 'commit1\...commit2' notations cannot be used).
+ and 'commit1\...commit2' notations cannot be used).
+
With `--pretty` format other than `oneline` (for obvious reasons),
this causes the output to have two extra lines of information
diff --git a/Documentation/technical/api-gitattributes.txt b/Documentation/technical/api-gitattributes.txt
index ce363b6..2602668 100644
--- a/Documentation/technical/api-gitattributes.txt
+++ b/Documentation/technical/api-gitattributes.txt
@@ -99,7 +99,7 @@ static void setup_check(void)
The attribute is Unset, by listing the name of the
attribute prefixed with a dash - for the path.
} else if (ATTR_UNSET(value)) {
- The attribute is not set nor unset for the path.
+ The attribute is neither set nor unset for the path.
} else if (!strcmp(value, "input")) {
If none of ATTR_TRUE(), ATTR_FALSE(), or ATTR_UNSET() is
true, the value is a string set in the gitattributes
diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt
index 39c6410..18dea8d 100644
--- a/Documentation/technical/pack-protocol.txt
+++ b/Documentation/technical/pack-protocol.txt
@@ -237,10 +237,10 @@ The client now sends the maximum commit history depth it wants for
this transaction, which is the number of commits it wants from the
tip of the history, if any, as a 'deepen' line. A depth of 0 is the
same as not making a depth request. The client does not want to receive
-any commits beyond this depth, nor objects needed only to complete
-those commits. Commits whose parents are not received as a result are
-defined as shallow and marked as such in the server. This information
-is sent back to the client in the next step.
+any commits beyond this depth, nor does it want objects needed only to
+complete those commits. Commits whose parents are not received as a
+result are defined as shallow and marked as such in the server. This
+information is sent back to the client in the next step.
Once all the 'want's and 'shallow's (and optional 'deepen') are
transferred, clients MUST send a flush-pkt, to tell the server side
diff --git a/Documentation/technical/protocol-common.txt b/Documentation/technical/protocol-common.txt
index fb7ff08..889985f 100644
--- a/Documentation/technical/protocol-common.txt
+++ b/Documentation/technical/protocol-common.txt
@@ -39,7 +39,7 @@ More specifically, they:
caret `^`, colon `:`, question-mark `?`, asterisk `*`,
or open bracket `[` anywhere.
-. They cannot end with a slash `/` nor a dot `.`.
+. They cannot end with a slash `/` or a dot `.`.
. They cannot end with the sequence `.lock`.
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index d4f9804..022e74e 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -4074,7 +4074,7 @@ the `HEAD` tree, and stage 3 to the `$target` tree.
Earlier we said that trivial merges are done inside
`git read-tree -m`. For example, if the file did not change
-from `$orig` to `HEAD` nor `$target`, or if the file changed
+from `$orig` to `HEAD` or `$target`, or if the file changed
from `$orig` to `HEAD` and `$orig` to `$target` the same way,
obviously the final outcome is what is in `HEAD`. What the
above example shows is that file `hello.c` was changed from
--
1.9.0.279.gdc9e3eb
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 2/4] contrib: Fix misuses of "nor"
2014-03-20 22:16 [PATCH 0/4] Fix misuses of "nor" (v2) Justin Lebar
2014-03-20 22:16 ` [PATCH 1/4] Documentation: Fix misuses of "nor" Justin Lebar
@ 2014-03-20 22:16 ` Justin Lebar
2014-03-20 22:16 ` [PATCH 3/4] Fix misuses of "nor" in comments Justin Lebar
2014-03-20 22:16 ` [PATCH 4/4] Fix misuses of "nor" outside comments and in tests Justin Lebar
3 siblings, 0 replies; 11+ messages in thread
From: Justin Lebar @ 2014-03-20 22:16 UTC (permalink / raw)
To: git
Cc: Justin Lebar, Richard Hansen, Shawn O. Pearce, Jeff King,
Jonathan Nieder
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.0.279.gdc9e3eb
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/4] Fix misuses of "nor" in comments
2014-03-20 22:16 [PATCH 0/4] Fix misuses of "nor" (v2) Justin Lebar
2014-03-20 22:16 ` [PATCH 1/4] Documentation: Fix misuses of "nor" Justin Lebar
2014-03-20 22:16 ` [PATCH 2/4] contrib: " Justin Lebar
@ 2014-03-20 22:16 ` Justin Lebar
2014-03-20 22:34 ` Jason St. John
2014-03-20 22:16 ` [PATCH 4/4] Fix misuses of "nor" outside comments and in tests Justin Lebar
3 siblings, 1 reply; 11+ messages in thread
From: Justin Lebar @ 2014-03-20 22:16 UTC (permalink / raw)
To: git
Cc: Justin Lebar, Richard Hansen, Shawn O. Pearce, Jeff King,
Jonathan Nieder, Justin Lebar
Signed-off-by: Justin Lebar <jlebar@gmail.com>
---
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 <something> is _not_ a commit, either "--" is present
- * or <something> is not a path, no -t nor -b was given, and
+ * or <something> is not a path, no -t or -b was given, and
* and there is a tracking branch whose name is <something>
* in one and only one remote, then this is a short-hand to
* fork local <something> 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 -- <paths>' instead."));
@@ -327,7 +327,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
die(_("%s reset is not allowed in a bare repository"),
_(reset_type_names[reset_type]));
- /* Soft reset does not touch the index file nor the working tree
+ /* Soft reset does not touch the index file or the working tree
* at all, but requires them in a good order. Other resets reset
* the index file to the tree object we are switching to. */
if (reset_type == SOFT || reset_type == KEEP)
diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index d9217ce..53dc042 100644
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -698,7 +698,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
if (extra || reflog) {
/* "listing" mode is incompatible with
- * independent nor merge-base modes.
+ * independent and merge-base modes.
*/
if (independent || merge_base)
usage_with_options(show_branch_usage,
diff --git a/column.c b/column.c
index 9367ba5..1854540 100644
--- a/column.c
+++ b/column.c
@@ -311,7 +311,7 @@ static int parse_config(unsigned int *colopts, const char *value)
value += strspn(value, sep);
}
/*
- * Setting layout implies "always" if neither always, never
+ * Setting layout implies "always" if neither always, never,
* nor auto is specified.
*
* Current value in COL_ENABLE_MASK is disregarded. This means if
diff --git a/contrib/examples/git-checkout.sh b/contrib/examples/git-checkout.sh
index 1a7689a..d2c1f98 100755
--- a/contrib/examples/git-checkout.sh
+++ b/contrib/examples/git-checkout.sh
@@ -168,7 +168,7 @@ cd_to_toplevel
# branch. However, if "git checkout HEAD" detaches the HEAD
# from the current branch, even though that may be logically
# correct, it feels somewhat funny. More importantly, we do not
-# want "git checkout" nor "git checkout -f" to detach HEAD.
+# want "git checkout" or "git checkout -f" to detach HEAD.
detached=
detach_warn=
diff --git a/contrib/examples/git-reset.sh b/contrib/examples/git-reset.sh
index bafeb52..cb1bbf3 100755
--- a/contrib/examples/git-reset.sh
+++ b/contrib/examples/git-reset.sh
@@ -40,7 +40,7 @@ case "$1" in --) shift ;; esac
# git reset --mixed 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 test $# != 0
then
test "$reset_type" = "--mixed" ||
@@ -60,7 +60,7 @@ then
update=-u
fi
-# Soft reset does not touch the index file nor the working tree
+# Soft reset does not touch the index file or the working tree
# at all, but requires them in a good order. Other resets reset
# the index file to the tree object we are switching to.
if test "$reset_type" = "--soft"
diff --git a/contrib/fast-import/import-directories.perl b/contrib/fast-import/import-directories.perl
index 7f3afa5..4dec1f1 100755
--- a/contrib/fast-import/import-directories.perl
+++ b/contrib/fast-import/import-directories.perl
@@ -109,8 +109,8 @@ was available previously is not included in this revision, it will
be removed.
If an on-disk revision is incomplete, you can point to files from
-a previous revision. There are no restriction as to where the source
-files are located, nor to the names of them.
+a previous revision. There are no restrictions on where the source
+files are located, nor on their names.
[3.files]
; the key is the path inside the repository, the value is the path
diff --git a/delta.h b/delta.h
index b9d333d..9b67531 100644
--- a/delta.h
+++ b/delta.h
@@ -9,7 +9,7 @@ struct delta_index;
*
* This returns a pointer to a struct delta_index that should be passed to
* subsequent create_delta() calls, or to free_delta_index(). A NULL pointer
- * is returned on failure. The given buffer must not be freed nor altered
+ * is returned on failure. The given buffer must not be freed or altered
* before free_delta_index() is called. The returned pointer must be freed
* using free_delta_index().
*/
diff --git a/diff.c b/diff.c
index 1cd4672..635dee2 100644
--- a/diff.c
+++ b/diff.c
@@ -3942,7 +3942,7 @@ static int diff_scoreopt_parse(const char *opt)
}
}
if (cmd != 'M' && cmd != 'C' && cmd != 'B')
- return -1; /* that is not a -M, -C nor -B option */
+ return -1; /* that is not a -M, -C, or -B option */
opt1 = parse_rename_score(&opt);
if (cmd != 'B')
diff --git a/git-am.sh b/git-am.sh
index bbea430..e92e5bb 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -523,7 +523,7 @@ Use \"git am --abort\" to remove it.")"
esac
fi
- # Make sure we are not given --skip, --continue, nor --abort
+ # Make sure we are not given --skip, --continue, or --abort
test "$skip$resolved$abort" = "" ||
die "$(gettext "Resolve operation not in progress, we are not resuming.")"
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 3bc0f0b..52108b9 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1490,7 +1490,7 @@ sub is_valid_pathname {
my $input = shift;
return undef unless defined $input;
- # no '.' or '..' as elements of path, i.e. no '.' nor '..'
+ # no '.' or '..' as elements of path, i.e. no '.' or '..'
# at the beginning, at the end, and between slashes.
# also this catches doubled slashes
if ($input =~ m!(^|/)(|\.|\.\.)(/|$)!) {
diff --git a/http.h b/http.h
index cd37d58..cba09d1 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 is not something Makefile should set nor something users should
+ * pass via CFLAGS.
*/
#undef USE_CURL_MULTI
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index 6e804a2..62f3293 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -1191,7 +1191,7 @@ sub do_fetch {
# we can have a branch that was deleted, then re-added
# under the same name but copied from another path, in
# which case we'll have multiple parents (we don't
- # want to break the original ref, nor lose copypath info):
+ # want to break the original ref or lose copypath info):
if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
push @{$log_entry->{parents}}, $lc;
return $log_entry;
diff --git a/perl/Git/SVN/Migration.pm b/perl/Git/SVN/Migration.pm
index 30daf35..cf6ffa7 100644
--- a/perl/Git/SVN/Migration.pm
+++ b/perl/Git/SVN/Migration.pm
@@ -1,6 +1,6 @@
package Git::SVN::Migration;
# these version numbers do NOT correspond to actual version numbers
-# of git nor git-svn. They are just relative.
+# of git or git-svn. They are just relative.
#
# v0 layout: .git/$id/info/url, refs/heads/$id-HEAD
#
diff --git a/pkt-line.h b/pkt-line.h
index 0a838d1..b6bd8b5 100644
--- a/pkt-line.h
+++ b/pkt-line.h
@@ -28,7 +28,7 @@ void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((f
* Read a packetized line into the buffer, which must be at least size bytes
* long. The return value specifies the number of bytes read into the buffer.
*
- * If src_buffer is not NULL (and nor is *src_buffer), it should point to a
+ * If src_buffer is not NULL (and neither is *src_buffer), it should point to a
* buffer containing the packet data to parse, of at least *src_len bytes.
* After the function returns, src_buf will be incremented and src_len
* decremented by the number of bytes consumed.
diff --git a/remote.c b/remote.c
index 5f63d55..f43c7a9 100644
--- a/remote.c
+++ b/remote.c
@@ -1409,7 +1409,7 @@ int match_push_refs(struct ref *src, struct ref **dst,
/*
* Remote doesn't have it, and we have no
* explicit pattern, and we don't have
- * --all nor --mirror.
+ * --all or --mirror.
*/
goto free_name;
diff --git a/sha1_file.c b/sha1_file.c
index 6e8c05d..b79efe4 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -787,7 +787,7 @@ void close_pack_index(struct packed_git *p)
* contain the same set of objects as an existing one. In that case
* the resulting file might be different even if its name would be the
* same. It is best to close any reference to the old pack before it is
- * replaced on disk. Of course no index pointers nor windows for given pack
+ * replaced on disk. Of course no index pointers or windows for given pack
* must subsist at this point. If ever objects from this pack are requested
* again, the new version of the pack will be reinitialized through
* reprepare_packed_git().
diff --git a/test-chmtime.c b/test-chmtime.c
index 0df7487..dfe8a83 100644
--- a/test-chmtime.c
+++ b/test-chmtime.c
@@ -1,6 +1,6 @@
/*
* This program can either change modification time of the given
- * file(s) or just print it. The program does not change atime nor
+ * file(s) or just print it. The program does not change atime or
* ctime (their values are explicitly preserved).
*
* The mtime can be changed to an absolute value:
--
1.9.0.279.gdc9e3eb
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 3/4] Fix misuses of "nor" in comments
2014-03-20 22:16 ` [PATCH 3/4] Fix misuses of "nor" in comments Justin Lebar
@ 2014-03-20 22:34 ` Jason St. John
2014-03-20 23:13 ` Justin Lebar
0 siblings, 1 reply; 11+ messages in thread
From: Jason St. John @ 2014-03-20 22:34 UTC (permalink / raw)
To: Justin Lebar
Cc: git, Richard Hansen, Shawn O. Pearce, Jeff King, Jonathan Nieder,
Justin Lebar
On Thu, Mar 20, 2014 at 6:16 PM, Justin Lebar <jlebar@google.com> wrote:
> Signed-off-by: Justin Lebar <jlebar@gmail.com>
> ---
> 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 ;-).
> */
I don't think the change from "give" to "giving" here is grammatically correct.
> 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 <something> is _not_ a commit, either "--" is present
> - * or <something> is not a path, no -t nor -b was given, and
> + * or <something> is not a path, no -t or -b was given, and
> * and there is a tracking branch whose name is <something>
> * in one and only one remote, then this is a short-hand to
> * fork local <something> 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 -- <paths>' instead."));
> @@ -327,7 +327,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
> die(_("%s reset is not allowed in a bare repository"),
> _(reset_type_names[reset_type]));
>
> - /* Soft reset does not touch the index file nor the working tree
> + /* Soft reset does not touch the index file or the working tree
> * at all, but requires them in a good order. Other resets reset
> * the index file to the tree object we are switching to. */
> if (reset_type == SOFT || reset_type == KEEP)
> diff --git a/builtin/show-branch.c b/builtin/show-branch.c
> index d9217ce..53dc042 100644
> --- a/builtin/show-branch.c
> +++ b/builtin/show-branch.c
> @@ -698,7 +698,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
>
> if (extra || reflog) {
> /* "listing" mode is incompatible with
> - * independent nor merge-base modes.
> + * independent and merge-base modes.
> */
> if (independent || merge_base)
> usage_with_options(show_branch_usage,
> diff --git a/column.c b/column.c
> index 9367ba5..1854540 100644
> --- a/column.c
> +++ b/column.c
> @@ -311,7 +311,7 @@ static int parse_config(unsigned int *colopts, const char *value)
> value += strspn(value, sep);
> }
> /*
> - * Setting layout implies "always" if neither always, never
> + * Setting layout implies "always" if neither always, never,
> * nor auto is specified.
This sentence does not seem grammatically correct. How about ``If none
of "always", "never", or "auto" is specified, then setting layout
implies "always".``?
> *
> * Current value in COL_ENABLE_MASK is disregarded. This means if
> diff --git a/contrib/examples/git-checkout.sh b/contrib/examples/git-checkout.sh
> index 1a7689a..d2c1f98 100755
> --- a/contrib/examples/git-checkout.sh
> +++ b/contrib/examples/git-checkout.sh
> @@ -168,7 +168,7 @@ cd_to_toplevel
> # branch. However, if "git checkout HEAD" detaches the HEAD
> # from the current branch, even though that may be logically
> # correct, it feels somewhat funny. More importantly, we do not
> -# want "git checkout" nor "git checkout -f" to detach HEAD.
> +# want "git checkout" or "git checkout -f" to detach HEAD.
>
> detached=
> detach_warn=
> diff --git a/contrib/examples/git-reset.sh b/contrib/examples/git-reset.sh
> index bafeb52..cb1bbf3 100755
> --- a/contrib/examples/git-reset.sh
> +++ b/contrib/examples/git-reset.sh
> @@ -40,7 +40,7 @@ case "$1" in --) shift ;; esac
>
> # git reset --mixed 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 test $# != 0
> then
> test "$reset_type" = "--mixed" ||
> @@ -60,7 +60,7 @@ then
> update=-u
> fi
>
> -# Soft reset does not touch the index file nor the working tree
> +# Soft reset does not touch the index file or the working tree
> # at all, but requires them in a good order. Other resets reset
> # the index file to the tree object we are switching to.
> if test "$reset_type" = "--soft"
> diff --git a/contrib/fast-import/import-directories.perl b/contrib/fast-import/import-directories.perl
> index 7f3afa5..4dec1f1 100755
> --- a/contrib/fast-import/import-directories.perl
> +++ b/contrib/fast-import/import-directories.perl
> @@ -109,8 +109,8 @@ was available previously is not included in this revision, it will
> be removed.
>
> If an on-disk revision is incomplete, you can point to files from
> -a previous revision. There are no restriction as to where the source
> -files are located, nor to the names of them.
> +a previous revision. There are no restrictions on where the source
> +files are located, nor on their names.
>
> [3.files]
> ; the key is the path inside the repository, the value is the path
> diff --git a/delta.h b/delta.h
> index b9d333d..9b67531 100644
> --- a/delta.h
> +++ b/delta.h
> @@ -9,7 +9,7 @@ struct delta_index;
> *
> * This returns a pointer to a struct delta_index that should be passed to
> * subsequent create_delta() calls, or to free_delta_index(). A NULL pointer
> - * is returned on failure. The given buffer must not be freed nor altered
> + * is returned on failure. The given buffer must not be freed or altered
> * before free_delta_index() is called. The returned pointer must be freed
> * using free_delta_index().
> */
> diff --git a/diff.c b/diff.c
> index 1cd4672..635dee2 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -3942,7 +3942,7 @@ static int diff_scoreopt_parse(const char *opt)
> }
> }
> if (cmd != 'M' && cmd != 'C' && cmd != 'B')
> - return -1; /* that is not a -M, -C nor -B option */
> + return -1; /* that is not a -M, -C, or -B option */
>
> opt1 = parse_rename_score(&opt);
> if (cmd != 'B')
> diff --git a/git-am.sh b/git-am.sh
> index bbea430..e92e5bb 100755
> --- a/git-am.sh
> +++ b/git-am.sh
> @@ -523,7 +523,7 @@ Use \"git am --abort\" to remove it.")"
> esac
> fi
>
> - # Make sure we are not given --skip, --continue, nor --abort
> + # Make sure we are not given --skip, --continue, or --abort
> test "$skip$resolved$abort" = "" ||
> die "$(gettext "Resolve operation not in progress, we are not resuming.")"
>
> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
> index 3bc0f0b..52108b9 100755
> --- a/gitweb/gitweb.perl
> +++ b/gitweb/gitweb.perl
> @@ -1490,7 +1490,7 @@ sub is_valid_pathname {
> my $input = shift;
>
> return undef unless defined $input;
> - # no '.' or '..' as elements of path, i.e. no '.' nor '..'
> + # no '.' or '..' as elements of path, i.e. no '.' or '..'
> # at the beginning, at the end, and between slashes.
> # also this catches doubled slashes
> if ($input =~ m!(^|/)(|\.|\.\.)(/|$)!) {
> diff --git a/http.h b/http.h
> index cd37d58..cba09d1 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 is not something Makefile should set nor something users should
> + * pass via CFLAGS.
> */
> #undef USE_CURL_MULTI
>
To leave "nor" here, I think you need to replace "not" with "neither".
> diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
> index 6e804a2..62f3293 100644
> --- a/perl/Git/SVN.pm
> +++ b/perl/Git/SVN.pm
> @@ -1191,7 +1191,7 @@ sub do_fetch {
> # we can have a branch that was deleted, then re-added
> # under the same name but copied from another path, in
> # which case we'll have multiple parents (we don't
> - # want to break the original ref, nor lose copypath info):
> + # want to break the original ref or lose copypath info):
> if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
> push @{$log_entry->{parents}}, $lc;
> return $log_entry;
> diff --git a/perl/Git/SVN/Migration.pm b/perl/Git/SVN/Migration.pm
> index 30daf35..cf6ffa7 100644
> --- a/perl/Git/SVN/Migration.pm
> +++ b/perl/Git/SVN/Migration.pm
> @@ -1,6 +1,6 @@
> package Git::SVN::Migration;
> # these version numbers do NOT correspond to actual version numbers
> -# of git nor git-svn. They are just relative.
> +# of git or git-svn. They are just relative.
> #
> # v0 layout: .git/$id/info/url, refs/heads/$id-HEAD
> #
> diff --git a/pkt-line.h b/pkt-line.h
> index 0a838d1..b6bd8b5 100644
> --- a/pkt-line.h
> +++ b/pkt-line.h
> @@ -28,7 +28,7 @@ void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((f
> * Read a packetized line into the buffer, which must be at least size bytes
> * long. The return value specifies the number of bytes read into the buffer.
> *
> - * If src_buffer is not NULL (and nor is *src_buffer), it should point to a
> + * If src_buffer is not NULL (and neither is *src_buffer), it should point to a
> * buffer containing the packet data to parse, of at least *src_len bytes.
> * After the function returns, src_buf will be incremented and src_len
> * decremented by the number of bytes consumed.
This would be better worded as "If src_buffer and *src_buffer are not
NULL, it should ..."
> diff --git a/remote.c b/remote.c
> index 5f63d55..f43c7a9 100644
> --- a/remote.c
> +++ b/remote.c
> @@ -1409,7 +1409,7 @@ int match_push_refs(struct ref *src, struct ref **dst,
> /*
> * Remote doesn't have it, and we have no
> * explicit pattern, and we don't have
> - * --all nor --mirror.
> + * --all or --mirror.
> */
> goto free_name;
>
> diff --git a/sha1_file.c b/sha1_file.c
> index 6e8c05d..b79efe4 100644
> --- a/sha1_file.c
> +++ b/sha1_file.c
> @@ -787,7 +787,7 @@ void close_pack_index(struct packed_git *p)
> * contain the same set of objects as an existing one. In that case
> * the resulting file might be different even if its name would be the
> * same. It is best to close any reference to the old pack before it is
> - * replaced on disk. Of course no index pointers nor windows for given pack
> + * replaced on disk. Of course no index pointers or windows for given pack
> * must subsist at this point. If ever objects from this pack are requested
> * again, the new version of the pack will be reinitialized through
> * reprepare_packed_git().
> diff --git a/test-chmtime.c b/test-chmtime.c
> index 0df7487..dfe8a83 100644
> --- a/test-chmtime.c
> +++ b/test-chmtime.c
> @@ -1,6 +1,6 @@
> /*
> * This program can either change modification time of the given
> - * file(s) or just print it. The program does not change atime nor
> + * file(s) or just print it. The program does not change atime or
> * ctime (their values are explicitly preserved).
> *
> * The mtime can be changed to an absolute value:
> --
> 1.9.0.279.gdc9e3eb
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Jason
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 3/4] Fix misuses of "nor" in comments
2014-03-20 22:34 ` Jason St. John
@ 2014-03-20 23:13 ` Justin Lebar
2014-03-21 17:52 ` Junio C Hamano
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Justin Lebar @ 2014-03-20 23:13 UTC (permalink / raw)
To: Jason St. John
Cc: git, Richard Hansen, Shawn O. Pearce, Jeff King, Jonathan Nieder,
Justin Lebar
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
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 3/4] Fix misuses of "nor" in comments
2014-03-20 23:13 ` Justin Lebar
@ 2014-03-21 17:52 ` Junio C Hamano
2014-03-21 17:58 ` Junio C Hamano
2014-03-22 23:47 ` Jason St. John
2 siblings, 0 replies; 11+ messages in thread
From: Junio C Hamano @ 2014-03-21 17:52 UTC (permalink / raw)
To: Justin Lebar
Cc: Jason St. John, git, Richard Hansen, Shawn O. Pearce, Jeff King,
Jonathan Nieder, Justin Lebar
Justin Lebar <jlebar@google.com> writes:
> 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...
The new sentence should say what the original wanted to say, which I
think was:
- Do not pretend this is a git patch by saying --git
- Do not show extended headers.
I however think that extended headers is one attribute of a patch
being a "git patch", so I would say that the break down of your new
version:
> Do not pretend this is a git patch by
> - saying --git, or
> - giving extended headers.
makes sense.
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 3/4] Fix misuses of "nor" in comments
2014-03-20 23:13 ` Justin Lebar
2014-03-21 17:52 ` Junio C Hamano
@ 2014-03-21 17:58 ` Junio C Hamano
2014-03-22 23:47 ` Jason St. John
2 siblings, 0 replies; 11+ messages in thread
From: Junio C Hamano @ 2014-03-21 17:58 UTC (permalink / raw)
To: Justin Lebar
Cc: Jason St. John, git, Richard Hansen, Shawn O. Pearce, Jeff King,
Jonathan Nieder, Justin Lebar
Justin Lebar <jlebar@google.com> writes:
> 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?
While a patch is still in an early discussion stage, consider their
earlier incarnation rejected and send them afresh with [PATCH v2]
(or v3, v4,...) when rerolling.
When you do this kind of tree-wide clean-up, please make sure that
your patch applies cleanly to 'maint', 'master', 'next' and 'pu'
branches, to check if you are touching some area that are undergoing
other changes. If you find conflicts, please remove overlapping
parts from your main patch, make the removed parts into separate
patches that can be applied on top once these other topics that are
in flight are ready to be merged.
Thanks.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/4] Fix misuses of "nor" in comments
2014-03-20 23:13 ` Justin Lebar
2014-03-21 17:52 ` Junio C Hamano
2014-03-21 17:58 ` Junio C Hamano
@ 2014-03-22 23:47 ` Jason St. John
2014-03-29 1:52 ` Justin Lebar
2 siblings, 1 reply; 11+ messages in thread
From: Jason St. John @ 2014-03-22 23:47 UTC (permalink / raw)
To: Justin Lebar
Cc: git, Richard Hansen, Shawn O. Pearce, Jeff King, Jonathan Nieder,
Justin Lebar
On Thu, Mar 20, 2014 at 7:13 PM, Justin Lebar <jlebar@google.com> 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
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 3/4] Fix misuses of "nor" in comments
2014-03-22 23:47 ` Jason St. John
@ 2014-03-29 1:52 ` Justin Lebar
0 siblings, 0 replies; 11+ messages in thread
From: Justin Lebar @ 2014-03-29 1:52 UTC (permalink / raw)
To: Jason St. John
Cc: git, Richard Hansen, Shawn O. Pearce, Jeff King, Jonathan Nieder,
Justin Lebar
> 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 <jstjohn@purdue.edu> wrote:
> On Thu, Mar 20, 2014 at 7:13 PM, Justin Lebar <jlebar@google.com> 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
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 4/4] Fix misuses of "nor" outside comments and in tests
2014-03-20 22:16 [PATCH 0/4] Fix misuses of "nor" (v2) Justin Lebar
` (2 preceding siblings ...)
2014-03-20 22:16 ` [PATCH 3/4] Fix misuses of "nor" in comments Justin Lebar
@ 2014-03-20 22:16 ` Justin Lebar
3 siblings, 0 replies; 11+ messages in thread
From: Justin Lebar @ 2014-03-20 22:16 UTC (permalink / raw)
To: git
Cc: Justin Lebar, Richard Hansen, Shawn O. Pearce, Jeff King,
Jonathan Nieder, Justin Lebar
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 +-
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, <<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";
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 +0000 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 +0000
--
1.9.0.279.gdc9e3eb
^ permalink raw reply related [flat|nested] 11+ messages in thread