{"thread":{"id":"36325","subject":"[PATCH v5 1/4] Documentation: Fix misuses of \"nor\"","startedAt":"2014-03-31T22:11:44Z","lastAt":"2014-04-01T19:04:25Z","messageCount":8,"participants":["Justin Lebar","Junio C Hamano"],"isPatch":true,"patchVersion":5,"patchTotal":4},"messages":[{"id":"238168","messageId":"1396303907-23291-1-git-send-email-jlebar@google.com","threadId":"36325","inReplyTo":null,"subject":"[PATCH v5 1/4] Documentation: Fix misuses of \"nor\"","fromName":"Justin Lebar","fromEmail":"jlebar@google.com","sentAt":"2014-03-31T22:11:44Z","receivedAt":"2014-03-31T22:11:44Z","isPatch":true,"sender":{"key":"jlebar@google.com","avatar":"https://gravatar.com/avatar/d902057bd97387117efab9784adbc2208a3d0053c462e0e77c19e4323f23dd91?d=mp&s=160"},"body":"Signed-off-by: Justin Lebar <jlebar@google.com>\n---\n Documentation/CodingGuidelines                      |  4 ++--\n Documentation/config.txt                            |  6 +++---\n Documentation/diff-generate-patch.txt               |  2 +-\n Documentation/diff-options.txt                      |  2 +-\n Documentation/everyday.txt                          |  2 +-\n Documentation/git-add.txt                           |  4 ++--\n Documentation/git-count-objects.txt                 |  4 ++--\n Documentation/git-diff.txt                          |  4 ++--\n Documentation/git-prune.txt                         |  2 +-\n Documentation/git-push.txt                          |  2 +-\n Documentation/git-read-tree.txt                     |  2 +-\n Documentation/git-reset.txt                         |  6 +++---\n Documentation/git-show-branch.txt                   |  2 +-\n Documentation/git-show-ref.txt                      |  2 +-\n Documentation/howto/rebase-from-internal-branch.txt |  2 +-\n Documentation/howto/revert-a-faulty-merge.txt       |  4 ++--\n Documentation/howto/revert-branch-rebase.txt        |  2 +-\n Documentation/merge-options.txt                     | 15 +++++++--------\n Documentation/pretty-formats.txt                    |  2 +-\n Documentation/pretty-options.txt                    |  2 +-\n Documentation/rev-list-options.txt                  |  2 +-\n Documentation/technical/api-gitattributes.txt       |  2 +-\n Documentation/technical/pack-protocol.txt           |  8 ++++----\n Documentation/technical/protocol-common.txt         |  2 +-\n Documentation/user-manual.txt                       |  2 +-\n 25 files changed, 43 insertions(+), 44 deletions(-)\n\ndiff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines\nindex ef67b53..b99fa87 100644\n--- a/Documentation/CodingGuidelines\n+++ b/Documentation/CodingGuidelines\n@@ -91,13 +91,13 @@ For shell scripts specifically (not exhaustive):\n    E.g.: my_function () {\n \n  - As to use of grep, stick to a subset of BRE (namely, no \\{m,n\\},\n-   [::], [==], nor [..]) for portability.\n+   [::], [==], or [..]) for portability.\n \n    - We do not use \\{m,n\\};\n \n    - We do not use -E;\n \n-   - We do not use ? nor + (which are \\{0,1\\} and \\{1,\\}\n+   - We do not use ? or + (which are \\{0,1\\} and \\{1,\\}\n      respectively in BRE) but that goes without saying as these\n      are ERE elements not BRE (note that \\? and \\+ are not even part\n      of BRE -- making them accessible from BRE is a GNU extension).\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 5f4d793..c26a7c8 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -78,8 +78,8 @@ be escaped: use `\\\"` for `\"` and `\\\\` for `\\`.\n \n The following escape sequences (beside `\\\"` and `\\\\`) are recognized:\n `\\n` for newline character (NL), `\\t` for horizontal tabulation (HT, TAB)\n-and `\\b` for backspace (BS).  No other char escape sequence, nor octal\n-char sequences are valid.\n+and `\\b` for backspace (BS).  Other char escape sequences (including octal\n+escape sequences) are invalid.\n \n Variable values ending in a `\\` are continued on the next line in the\n customary UNIX fashion.\n@@ -827,7 +827,7 @@ color.diff::\n \tcommands will only use color when output is to the terminal.\n \tDefaults to false.\n +\n-This does not affect linkgit:git-format-patch[1] nor the\n+This does not affect linkgit:git-format-patch[1] or the\n 'git-diff-{asterisk}' plumbing commands.  Can be overridden on the\n command line with the `--color[=<when>]` option.\n \ndiff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt\nindex 55f499a..843a20b 100644\n--- a/Documentation/diff-generate-patch.txt\n+++ b/Documentation/diff-generate-patch.txt\n@@ -174,7 +174,7 @@ added, from the point of view of that parent).\n In the above example output, the function signature was changed\n from both files (hence two `-` removals from both file1 and\n file2, plus `++` to mean one line that was added does not appear\n-in either file1 nor file2).  Also eight other lines are the same\n+in either file1 or file2).  Also eight other lines are the same\n from file1 but do not appear in file2 (hence prefixed with `+`).\n \n When shown by `git diff-tree -c`, it compares the parents of a\ndiff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt\nindex 9b37b2a..6cb083a 100644\n--- a/Documentation/diff-options.txt\n+++ b/Documentation/diff-options.txt\n@@ -358,7 +358,7 @@ endif::git-log[]\n --irreversible-delete::\n \tOmit the preimage for deletes, i.e. print only the header but not\n \tthe diff between the preimage and `/dev/null`. The resulting patch\n-\tis not meant to be applied with `patch` nor `git apply`; this is\n+\tis not meant to be applied with `patch` or `git apply`; this is\n \tsolely for people who want to just concentrate on reviewing the\n \ttext after the change. In addition, the output obviously lack\n \tenough information to apply such a patch in reverse, even manually,\ndiff --git a/Documentation/everyday.txt b/Documentation/everyday.txt\nindex 2a18c1f..b2548ef 100644\n--- a/Documentation/everyday.txt\n+++ b/Documentation/everyday.txt\n@@ -263,7 +263,7 @@ that are not quite ready.\n <5> create topic branch as needed and apply, again with my\n sign-offs.\n <6> rebase internal topic branch that has not been merged to the\n-master, nor exposed as a part of a stable branch.\n+master or exposed as a part of a stable branch.\n <7> restart `pu` every time from the next.\n <8> and bundle topic branches still cooking.\n <9> backport a critical fix.\ndiff --git a/Documentation/git-add.txt b/Documentation/git-add.txt\nindex 48754cb..f3ab374 100644\n--- a/Documentation/git-add.txt\n+++ b/Documentation/git-add.txt\n@@ -296,9 +296,9 @@ patch::\n \n        y - stage this hunk\n        n - do not stage this hunk\n-       q - quit; do not stage this hunk nor any of the remaining ones\n+       q - quit; do not stage this hunk or any of the remaining ones\n        a - stage this hunk and all later hunks in the file\n-       d - do not stage this hunk nor any of the later hunks in the file\n+       d - do not stage this hunk or any of the later hunks in the file\n        g - select a hunk to go to\n        / - search for a hunk matching the given regex\n        j - leave this hunk undecided, see next undecided hunk\ndiff --git a/Documentation/git-count-objects.txt b/Documentation/git-count-objects.txt\nindex b300e84..2ff3568 100644\n--- a/Documentation/git-count-objects.txt\n+++ b/Documentation/git-count-objects.txt\n@@ -33,8 +33,8 @@ size-pack: disk space consumed by the packs, in KiB (unless -H is specified)\n prune-packable: the number of loose objects that are also present in\n the packs. These objects could be pruned using `git prune-packed`.\n +\n-garbage: the number of files in object database that are not valid\n-loose objects nor valid packs\n+garbage: the number of files in object database that are neither valid loose\n+objects nor valid packs\n +\n size-garbage: disk space consumed by garbage files, in KiB (unless -H is\n specified)\ndiff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt\nindex 56fb7e5..bbab35f 100644\n--- a/Documentation/git-diff.txt\n+++ b/Documentation/git-diff.txt\n@@ -158,8 +158,8 @@ $ git diff --name-status                <2>\n $ git diff arch/i386 include/asm-i386   <3>\n ------------\n +\n-<1> Show only modification, rename and copy, but not addition\n-nor deletion.\n+<1> Show only modification, rename, and copy, but not addition\n+or deletion.\n <2> Show only names and the nature of change, but not actual\n diff output.\n <3> Limit diff output to named subtrees.\ndiff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt\nindex 058ac0d..7a493c8 100644\n--- a/Documentation/git-prune.txt\n+++ b/Documentation/git-prune.txt\n@@ -56,7 +56,7 @@ OPTIONS\n EXAMPLE\n -------\n \n-To prune objects not used by your repository nor another that\n+To prune objects not used by your repository or another that\n borrows from your repository via its\n `.git/objects/info/alternates`:\n \ndiff --git a/Documentation/git-push.txt b/Documentation/git-push.txt\nindex 2b7f4f9..d0b9e2f 100644\n--- a/Documentation/git-push.txt\n+++ b/Documentation/git-push.txt\n@@ -385,7 +385,7 @@ will now start building on top of B.\n The command by default does not allow an update that is not a fast-forward\n to prevent such loss of history.\n \n-If you do not want to lose your work (history from X to B) nor the work by\n+If you do not want to lose your work (history from X to B) or the work by\n the other person (history from X to A), you would need to first fetch the\n history from the repository, create a history that contains changes done\n by both parties, and push the result back.\ndiff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt\nindex c4bde65..056c0db 100644\n--- a/Documentation/git-read-tree.txt\n+++ b/Documentation/git-read-tree.txt\n@@ -57,7 +57,7 @@ OPTIONS\n -n::\n --dry-run::\n \tCheck if the command would error out, without updating the index\n-\tnor the files in the working tree for real.\n+\tor the files in the working tree for real.\n \n -v::\n \tShow the progress of checking files out.\ndiff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt\nindex f445cb3..24bf4d5 100644\n--- a/Documentation/git-reset.txt\n+++ b/Documentation/git-reset.txt\n@@ -21,7 +21,7 @@ to HEAD in all forms.\n \n 'git reset' [-q] [<tree-ish>] [--] <paths>...::\n \tThis form resets the index entries for all <paths> to their\n-\tstate at <tree-ish>.  (It does not affect the working tree, nor\n+\tstate at <tree-ish>.  (It does not affect the working tree or\n \tthe current branch.)\n +\n This means that `git reset <paths>` is the opposite of `git add\n@@ -51,7 +51,7 @@ section of linkgit:git-add[1] to learn how to operate the `--patch` mode.\n +\n --\n --soft::\n-\tDoes not touch the index file nor the working tree at all (but\n+\tDoes not touch the index file or the working tree at all (but\n \tresets the head to <commit>, just like all modes do). This leaves\n \tall your changed files \"Changes to be committed\", as 'git status'\n \twould put it.\n@@ -115,7 +115,7 @@ and changes with these files are distracting.\n <2> Somebody asks you to pull, and the changes sounds worthy of merging.\n <3> However, you already dirtied the index (i.e. your index does\n not match the HEAD commit).  But you know the pull you are going\n-to make does not affect frotz.c nor filfre.c, so you revert the\n+to make does not affect frotz.c or filfre.c, so you revert the\n index changes for these two files.  Your changes in working tree\n remain there.\n <4> Then you can pull and merge, leaving frotz.c and filfre.c\ndiff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt\nindex a515648..b91d4e5 100644\n--- a/Documentation/git-show-branch.txt\n+++ b/Documentation/git-show-branch.txt\n@@ -25,7 +25,7 @@ and/or refs/tags) semi-visually.\n It cannot show more than 29 branches and commits at a time.\n \n It uses `showbranch.default` multi-valued configuration items if\n-no <rev> nor <glob> is given on the command line.\n+no <rev> or <glob> is given on the command line.\n \n \n OPTIONS\ndiff --git a/Documentation/git-show-ref.txt b/Documentation/git-show-ref.txt\nindex ffd1b03..2a6f89b 100644\n--- a/Documentation/git-show-ref.txt\n+++ b/Documentation/git-show-ref.txt\n@@ -89,7 +89,7 @@ OPTIONS\n \tShow references matching one or more patterns. Patterns are matched from\n \tthe end of the full name, and only complete parts are matched, e.g.\n \t'master' matches 'refs/heads/master', 'refs/remotes/origin/master',\n-\t'refs/tags/jedi/master' but not 'refs/heads/mymaster' nor\n+\t'refs/tags/jedi/master' but not 'refs/heads/mymaster' or\n \t'refs/remotes/master/jedi'.\n \n OUTPUT\ndiff --git a/Documentation/howto/rebase-from-internal-branch.txt b/Documentation/howto/rebase-from-internal-branch.txt\nindex 19ab604..02cb5f7 100644\n--- a/Documentation/howto/rebase-from-internal-branch.txt\n+++ b/Documentation/howto/rebase-from-internal-branch.txt\n@@ -139,7 +139,7 @@ You fetch from upstream, but not merge.\n     $ git fetch upstream\n \n This leaves the updated upstream head in .git/FETCH_HEAD but\n-does not touch your .git/HEAD nor .git/refs/heads/master.\n+does not touch your .git/HEAD or .git/refs/heads/master.\n You run \"git rebase\" now.\n \n     $ git rebase FETCH_HEAD master\ndiff --git a/Documentation/howto/revert-a-faulty-merge.txt b/Documentation/howto/revert-a-faulty-merge.txt\nindex acf3e47..462255e 100644\n--- a/Documentation/howto/revert-a-faulty-merge.txt\n+++ b/Documentation/howto/revert-a-faulty-merge.txt\n@@ -54,7 +54,7 @@ where C and D are to fix what was broken in A and B, and you may already\n have some other changes on the mainline after W.\n \n If you merge the updated side branch (with D at its tip), none of the\n-changes made in A nor B will be in the result, because they were reverted\n+changes made in A or B will be in the result, because they were reverted\n by W.  That is what Alan saw.\n \n Linus explains the situation:\n@@ -90,7 +90,7 @@ with:\n     $ git revert W\n \n This history would (ignoring possible conflicts between what W and W..Y\n-changed) be equivalent to not having W nor Y at all in the history:\n+changed) be equivalent to not having W or Y at all in the history:\n \n  ---o---o---o---M---x---x-------x----\n \t       /\ndiff --git a/Documentation/howto/revert-branch-rebase.txt b/Documentation/howto/revert-branch-rebase.txt\nindex 85f69db..149508e 100644\n--- a/Documentation/howto/revert-branch-rebase.txt\n+++ b/Documentation/howto/revert-branch-rebase.txt\n@@ -137,7 +137,7 @@ $ make clean test ;# make sure it did not cause other breakage.\n ------------------------------------------------\n \n Everything is in the good order.  I do not need the temporary branch\n-nor tag anymore, so remove them:\n+or tag anymore, so remove them:\n \n ------------------------------------------------\n $ rm -f .git/refs/tags/pu-anchor\ndiff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt\nindex e134315..f08e9b8 100644\n--- a/Documentation/merge-options.txt\n+++ b/Documentation/merge-options.txt\n@@ -63,14 +63,13 @@ merge.\n \n --squash::\n --no-squash::\n-\tProduce the working tree and index state as if a real\n-\tmerge happened (except for the merge information),\n-\tbut do not actually make a commit or\n-\tmove the `HEAD`, nor record `$GIT_DIR/MERGE_HEAD` to\n-\tcause the next `git commit` command to create a merge\n-\tcommit.  This allows you to create a single commit on\n-\ttop of the current branch whose effect is the same as\n-\tmerging another branch (or more in case of an octopus).\n+\tProduce the working tree and index state as if a real merge\n+\thappened (except for the merge information), but do not actually\n+\tmake a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD`\n+\t(to cause the next `git commit` command to create a merge\n+\tcommit).  This allows you to create a single commit on top of\n+\tthe current branch whose effect is the same as merging another\n+\tbranch (or more in case of an octopus).\n +\n With --no-squash perform the merge and commit the result. This\n option can be used to override --squash.\ndiff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt\nindex 1d174fd..85d6353 100644\n--- a/Documentation/pretty-formats.txt\n+++ b/Documentation/pretty-formats.txt\n@@ -78,7 +78,7 @@ The 'raw' format shows the entire commit exactly as\n stored in the commit object.  Notably, the SHA-1s are\n displayed in full, regardless of whether --abbrev or\n --no-abbrev are used, and 'parents' information show the\n-true parent commits, without taking grafts nor history\n+true parent commits, without taking grafts or history\n simplification into account.\n \n * 'format:<string>'\ndiff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt\nindex eea0e30..8569e29 100644\n--- a/Documentation/pretty-options.txt\n+++ b/Documentation/pretty-options.txt\n@@ -39,7 +39,7 @@ people using 80-column terminals.\n \tShow the notes (see linkgit:git-notes[1]) that annotate the\n \tcommit, when showing the commit log message.  This is the default\n \tfor `git log`, `git show` and `git whatchanged` commands when\n-\tthere is no `--pretty`, `--format` nor `--oneline` option given\n+\tthere is no `--pretty`, `--format`, or `--oneline` option given\n \ton the command line.\n +\n By default, the notes shown are from the notes refs listed in the\ndiff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt\nindex 03533af..47c8dcc 100644\n--- a/Documentation/rev-list-options.txt\n+++ b/Documentation/rev-list-options.txt\n@@ -237,7 +237,7 @@ list.\n \treflog entries from the most recent one to older ones.\n \tWhen this option is used you cannot specify commits to\n \texclude (that is, '{caret}commit', 'commit1..commit2',\n-\tnor 'commit1\\...commit2' notations cannot be used).\n+\tand 'commit1\\...commit2' notations cannot be used).\n +\n With `--pretty` format other than `oneline` (for obvious reasons),\n this causes the output to have two extra lines of information\ndiff --git a/Documentation/technical/api-gitattributes.txt b/Documentation/technical/api-gitattributes.txt\nindex ce363b6..2602668 100644\n--- a/Documentation/technical/api-gitattributes.txt\n+++ b/Documentation/technical/api-gitattributes.txt\n@@ -99,7 +99,7 @@ static void setup_check(void)\n \t\tThe attribute is Unset, by listing the name of the\n \t\tattribute prefixed with a dash - for the path.\n \t} else if (ATTR_UNSET(value)) {\n-\t\tThe attribute is not set nor unset for the path.\n+\t\tThe attribute is neither set nor unset for the path.\n \t} else if (!strcmp(value, \"input\")) {\n \t\tIf none of ATTR_TRUE(), ATTR_FALSE(), or ATTR_UNSET() is\n \t\ttrue, the value is a string set in the gitattributes\ndiff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt\nindex 39c6410..18dea8d 100644\n--- a/Documentation/technical/pack-protocol.txt\n+++ b/Documentation/technical/pack-protocol.txt\n@@ -237,10 +237,10 @@ The client now sends the maximum commit history depth it wants for\n this transaction, which is the number of commits it wants from the\n tip of the history, if any, as a 'deepen' line.  A depth of 0 is the\n same as not making a depth request. The client does not want to receive\n-any commits beyond this depth, nor objects needed only to complete\n-those commits. Commits whose parents are not received as a result are\n-defined as shallow and marked as such in the server. This information\n-is sent back to the client in the next step.\n+any commits beyond this depth, nor does it want objects needed only to\n+complete those commits. Commits whose parents are not received as a\n+result are defined as shallow and marked as such in the server. This\n+information is sent back to the client in the next step.\n \n Once all the 'want's and 'shallow's (and optional 'deepen') are\n transferred, clients MUST send a flush-pkt, to tell the server side\ndiff --git a/Documentation/technical/protocol-common.txt b/Documentation/technical/protocol-common.txt\nindex fb7ff08..889985f 100644\n--- a/Documentation/technical/protocol-common.txt\n+++ b/Documentation/technical/protocol-common.txt\n@@ -39,7 +39,7 @@ More specifically, they:\n   caret `^`, colon `:`, question-mark `?`, asterisk `*`,\n   or open bracket `[` anywhere.\n \n-. They cannot end with a slash `/` nor a dot `.`.\n+. They cannot end with a slash `/` or a dot `.`.\n \n . They cannot end with the sequence `.lock`.\n \ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex d4f9804..022e74e 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -4074,7 +4074,7 @@ the `HEAD` tree, and stage 3 to the `$target` tree.\n \n Earlier we said that trivial merges are done inside\n `git read-tree -m`.  For example, if the file did not change\n-from `$orig` to `HEAD` nor `$target`, or if the file changed\n+from `$orig` to `HEAD` or `$target`, or if the file changed\n from `$orig` to `HEAD` and `$orig` to `$target` the same way,\n obviously the final outcome is what is in `HEAD`.  What the\n above example shows is that file `hello.c` was changed from\n-- \n1.9.1.423.g4596e3a\n"},{"id":"238170","messageId":"1396303907-23291-2-git-send-email-jlebar@google.com","threadId":"36325","inReplyTo":"1396303907-23291-1-git-send-email-jlebar@google.com","subject":"[PATCH v5 2/4] contrib: Fix misuses of \"nor\"","fromName":"Justin Lebar","fromEmail":"jlebar@google.com","sentAt":"2014-03-31T22:11:45Z","receivedAt":"2014-03-31T22:11:45Z","isPatch":true,"sender":{"key":"jlebar@google.com","avatar":"https://gravatar.com/avatar/d902057bd97387117efab9784adbc2208a3d0053c462e0e77c19e4323f23dd91?d=mp&s=160"},"body":"Signed-off-by: Justin Lebar <jlebar@google.com>\n---\n contrib/examples/git-commit.sh | 2 +-\n contrib/svn-fe/svn-fe.txt      | 4 ++--\n 2 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/contrib/examples/git-commit.sh b/contrib/examples/git-commit.sh\nindex 23ffb02..4aab1a6 100755\n--- a/contrib/examples/git-commit.sh\n+++ b/contrib/examples/git-commit.sh\n@@ -280,7 +280,7 @@ case \"$#,$also,$only,$amend\" in\n 0,,,*)\n \t;;\n *,,,*)\n-\tonly_include_assumed=\"# Explicit paths specified without -i nor -o; assuming --only paths...\"\n+\tonly_include_assumed=\"# Explicit paths specified without -i or -o; assuming --only paths...\"\n \talso=\n \t;;\n esac\ndiff --git a/contrib/svn-fe/svn-fe.txt b/contrib/svn-fe/svn-fe.txt\nindex 1128ab2..a3425f4 100644\n--- a/contrib/svn-fe/svn-fe.txt\n+++ b/contrib/svn-fe/svn-fe.txt\n@@ -40,8 +40,8 @@ manual page.\n NOTES\n -----\n Subversion dumps do not record a separate author and committer for\n-each revision, nor a separate display name and email address for\n-each author.  Like git-svn(1), 'svn-fe' will use the name\n+each revision, nor do they record a separate display name and email\n+address for each author.  Like git-svn(1), 'svn-fe' will use the name\n \n ---------\n user <user@UUID>\n-- \n1.9.1.423.g4596e3a\n"},{"id":"238172","messageId":"1396303907-23291-3-git-send-email-jlebar@google.com","threadId":"36325","inReplyTo":"1396303907-23291-1-git-send-email-jlebar@google.com","subject":"[PATCH v5 3/4] Fix misuses of \"nor\" in comments","fromName":"Justin Lebar","fromEmail":"jlebar@google.com","sentAt":"2014-03-31T22:11:46Z","receivedAt":"2014-03-31T22:11:46Z","isPatch":true,"sender":{"key":"jlebar@google.com","avatar":"https://gravatar.com/avatar/d902057bd97387117efab9784adbc2208a3d0053c462e0e77c19e4323f23dd91?d=mp&s=160"},"body":"Signed-off-by: Justin Lebar <jlebar@google.com>\n---\n Makefile                                    | 2 +-\n builtin/apply.c                             | 2 +-\n builtin/checkout.c                          | 2 +-\n builtin/log.c                               | 2 +-\n builtin/pack-objects.c                      | 2 +-\n column.c                                    | 4 ++--\n contrib/examples/git-checkout.sh            | 2 +-\n contrib/examples/git-reset.sh               | 4 ++--\n contrib/fast-import/import-directories.perl | 4 ++--\n delta.h                                     | 2 +-\n diff.c                                      | 2 +-\n git-am.sh                                   | 2 +-\n gitweb/gitweb.perl                          | 2 +-\n http.h                                      | 3 +--\n perl/Git/SVN.pm                             | 2 +-\n perl/Git/SVN/Migration.pm                   | 2 +-\n pkt-line.h                                  | 8 ++++----\n remote.c                                    | 2 +-\n sha1_file.c                                 | 2 +-\n test-chmtime.c                              | 2 +-\n 20 files changed, 26 insertions(+), 27 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex dddaf4f..fc02788 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -159,7 +159,7 @@ all::\n #\n # Define NEEDS_LIBINTL_BEFORE_LIBICONV if you need libintl before libiconv.\n #\n-# Define NO_INTPTR_T if you don't have intptr_t nor uintptr_t.\n+# Define NO_INTPTR_T if you don't have intptr_t or uintptr_t.\n #\n # Define NO_UINTMAX_T if you don't have uintmax_t.\n #\ndiff --git a/builtin/apply.c b/builtin/apply.c\nindex b0d0986..6013e19 100644\n--- a/builtin/apply.c\n+++ b/builtin/apply.c\n@@ -4061,7 +4061,7 @@ static int write_out_one_reject(struct patch *patch)\n \t\treturn error(_(\"cannot open %s: %s\"), namebuf, strerror(errno));\n \n \t/* Normal git tools never deal with .rej, so do not pretend\n-\t * this is a git patch by saying --git nor give extended\n+\t * this is a git patch by saying --git or giving extended\n \t * headers.  While at it, maybe please \"kompare\" that wants\n \t * the trailing TAB and some garbage at the end of line ;-).\n \t */\ndiff --git a/builtin/checkout.c b/builtin/checkout.c\nindex ada51fa..7f37d1a 100644\n--- a/builtin/checkout.c\n+++ b/builtin/checkout.c\n@@ -895,7 +895,7 @@ static int parse_branchname_arg(int argc, const char **argv,\n \t *       between A and B, A...B names that merge base.\n \t *\n \t *   (b) If <something> is _not_ a commit, either \"--\" is present\n-\t *       or <something> is not a path, no -t nor -b was given, and\n+\t *       or <something> is not a path, no -t or -b was given, and\n \t *       and there is a tracking branch whose name is <something>\n \t *       in one and only one remote, then this is a short-hand to\n \t *       fork local <something> from that remote-tracking branch.\ndiff --git a/builtin/log.c b/builtin/log.c\nindex b97373d..39e8836 100644\n--- a/builtin/log.c\n+++ b/builtin/log.c\n@@ -503,7 +503,7 @@ static void show_rev_tweak_rev(struct rev_info *rev, struct setup_revision_opt *\n \t\t/* There was no \"-m\" on the command line */\n \t\trev->ignore_merges = 0;\n \t\tif (!rev->first_parent_only && !rev->combine_merges) {\n-\t\t\t/* No \"--first-parent\", \"-c\", nor \"--cc\" */\n+\t\t\t/* No \"--first-parent\", \"-c\", or \"--cc\" */\n \t\t\trev->combine_merges = 1;\n \t\t\trev->dense_combined_merges = 1;\n \t\t}\ndiff --git a/builtin/pack-objects.c b/builtin/pack-objects.c\nindex 541667f..ef1f20e 100644\n--- a/builtin/pack-objects.c\n+++ b/builtin/pack-objects.c\n@@ -999,7 +999,7 @@ static int pbase_tree_cache_ix_incr(int ix)\n static struct pbase_tree {\n \tstruct pbase_tree *next;\n \t/* This is a phony \"cache\" entry; we are not\n-\t * going to evict it nor find it through _get()\n+\t * going to evict it or find it through _get()\n \t * mechanism -- this is for the toplevel node that\n \t * would almost always change with any commit.\n \t */\ndiff --git a/column.c b/column.c\nindex 9367ba5..8d1ce88 100644\n--- a/column.c\n+++ b/column.c\n@@ -311,8 +311,8 @@ static int parse_config(unsigned int *colopts, const char *value)\n \t\tvalue += strspn(value, sep);\n \t}\n \t/*\n-\t * Setting layout implies \"always\" if neither always, never\n-\t * nor auto is specified.\n+\t * If none of \"always\", \"never\", and \"auto\" is specified, then setting\n+\t * layout implies \"always\".\n \t *\n \t * Current value in COL_ENABLE_MASK is disregarded. This means if\n \t * you set column.ui = auto and pass --column=row, then \"auto\"\ndiff --git a/contrib/examples/git-checkout.sh b/contrib/examples/git-checkout.sh\nindex 1a7689a..d2c1f98 100755\n--- a/contrib/examples/git-checkout.sh\n+++ b/contrib/examples/git-checkout.sh\n@@ -168,7 +168,7 @@ cd_to_toplevel\n # branch.  However, if \"git checkout HEAD\" detaches the HEAD\n # from the current branch, even though that may be logically\n # correct, it feels somewhat funny.  More importantly, we do not\n-# want \"git checkout\" nor \"git checkout -f\" to detach HEAD.\n+# want \"git checkout\" or \"git checkout -f\" to detach HEAD.\n \n detached=\n detach_warn=\ndiff --git a/contrib/examples/git-reset.sh b/contrib/examples/git-reset.sh\nindex bafeb52..cb1bbf3 100755\n--- a/contrib/examples/git-reset.sh\n+++ b/contrib/examples/git-reset.sh\n@@ -40,7 +40,7 @@ case \"$1\" in --) shift ;; esac\n \n # git reset --mixed tree [--] paths... can be used to\n # load chosen paths from the tree into the index without\n-# affecting the working tree nor HEAD.\n+# affecting the working tree or HEAD.\n if test $# != 0\n then\n \ttest \"$reset_type\" = \"--mixed\" ||\n@@ -60,7 +60,7 @@ then\n \tupdate=-u\n fi\n \n-# Soft reset does not touch the index file nor the working tree\n+# Soft reset does not touch the index file or the working tree\n # at all, but requires them in a good order.  Other resets reset\n # the index file to the tree object we are switching to.\n if test \"$reset_type\" = \"--soft\"\ndiff --git a/contrib/fast-import/import-directories.perl b/contrib/fast-import/import-directories.perl\nindex 7f3afa5..4dec1f1 100755\n--- a/contrib/fast-import/import-directories.perl\n+++ b/contrib/fast-import/import-directories.perl\n@@ -109,8 +109,8 @@ was available previously is not included in this revision, it will\n be removed.\n \n If an on-disk revision is incomplete, you can point to files from\n-a previous revision. There are no restriction as to where the source\n-files are located, nor to the names of them.\n+a previous revision. There are no restrictions on where the source\n+files are located, nor on their names.\n \n  [3.files]\n  ; the key is the path inside the repository, the value is the path\ndiff --git a/delta.h b/delta.h\nindex b9d333d..9b67531 100644\n--- a/delta.h\n+++ b/delta.h\n@@ -9,7 +9,7 @@ struct delta_index;\n  *\n  * This returns a pointer to a struct delta_index that should be passed to\n  * subsequent create_delta() calls, or to free_delta_index().  A NULL pointer\n- * is returned on failure.  The given buffer must not be freed nor altered\n+ * is returned on failure.  The given buffer must not be freed or altered\n  * before free_delta_index() is called.  The returned pointer must be freed\n  * using free_delta_index().\n  */\ndiff --git a/diff.c b/diff.c\nindex 1cd4672..635dee2 100644\n--- a/diff.c\n+++ b/diff.c\n@@ -3942,7 +3942,7 @@ static int diff_scoreopt_parse(const char *opt)\n \t\t}\n \t}\n \tif (cmd != 'M' && cmd != 'C' && cmd != 'B')\n-\t\treturn -1; /* that is not a -M, -C nor -B option */\n+\t\treturn -1; /* that is not a -M, -C, or -B option */\n \n \topt1 = parse_rename_score(&opt);\n \tif (cmd != 'B')\ndiff --git a/git-am.sh b/git-am.sh\nindex bbea430..e92e5bb 100755\n--- a/git-am.sh\n+++ b/git-am.sh\n@@ -523,7 +523,7 @@ Use \\\"git am --abort\\\" to remove it.\")\"\n \t\tesac\n \tfi\n \n-\t# Make sure we are not given --skip, --continue, nor --abort\n+\t# Make sure we are not given --skip, --continue, or --abort\n \ttest \"$skip$resolved$abort\" = \"\" ||\n \t\tdie \"$(gettext \"Resolve operation not in progress, we are not resuming.\")\"\n \ndiff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\nindex 3bc0f0b..52108b9 100755\n--- a/gitweb/gitweb.perl\n+++ b/gitweb/gitweb.perl\n@@ -1490,7 +1490,7 @@ sub is_valid_pathname {\n \tmy $input = shift;\n \n \treturn undef unless defined $input;\n-\t# no '.' or '..' as elements of path, i.e. no '.' nor '..'\n+\t# no '.' or '..' as elements of path, i.e. no '.' or '..'\n \t# at the beginning, at the end, and between slashes.\n \t# also this catches doubled slashes\n \tif ($input =~ m!(^|/)(|\\.|\\.\\.)(/|$)!) {\ndiff --git a/http.h b/http.h\nindex cd37d58..a766066 100644\n--- a/http.h\n+++ b/http.h\n@@ -13,8 +13,7 @@\n /*\n  * We detect based on the cURL version if multi-transfer is\n  * usable in this implementation and define this symbol accordingly.\n- * This is not something Makefile should set nor users should pass\n- * via CFLAGS.\n+ * This shouldn't be set by the Makefile or by the user (e.g. via CFLAGS).\n  */\n #undef USE_CURL_MULTI\n \ndiff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm\nindex 6e804a2..62f3293 100644\n--- a/perl/Git/SVN.pm\n+++ b/perl/Git/SVN.pm\n@@ -1191,7 +1191,7 @@ sub do_fetch {\n \t\t# we can have a branch that was deleted, then re-added\n \t\t# under the same name but copied from another path, in\n \t\t# which case we'll have multiple parents (we don't\n-\t\t# want to break the original ref, nor lose copypath info):\n+\t\t# want to break the original ref or lose copypath info):\n \t\tif (my $log_entry = $self->find_parent_branch($paths, $rev)) {\n \t\t\tpush @{$log_entry->{parents}}, $lc;\n \t\t\treturn $log_entry;\ndiff --git a/perl/Git/SVN/Migration.pm b/perl/Git/SVN/Migration.pm\nindex 30daf35..cf6ffa7 100644\n--- a/perl/Git/SVN/Migration.pm\n+++ b/perl/Git/SVN/Migration.pm\n@@ -1,6 +1,6 @@\n package Git::SVN::Migration;\n # these version numbers do NOT correspond to actual version numbers\n-# of git nor git-svn.  They are just relative.\n+# of git or git-svn.  They are just relative.\n #\n # v0 layout: .git/$id/info/url, refs/heads/$id-HEAD\n #\ndiff --git a/pkt-line.h b/pkt-line.h\nindex 0a838d1..3cb9d91 100644\n--- a/pkt-line.h\n+++ b/pkt-line.h\n@@ -28,10 +28,10 @@ void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((f\n  * Read a packetized line into the buffer, which must be at least size bytes\n  * long. The return value specifies the number of bytes read into the buffer.\n  *\n- * If src_buffer is not NULL (and nor is *src_buffer), it should point to a\n- * buffer containing the packet data to parse, of at least *src_len bytes.\n- * After the function returns, src_buf will be incremented and src_len\n- * decremented by the number of bytes consumed.\n+ * If src_buffer and *src_buffer are not NULL, it should point to a buffer\n+ * containing the packet data to parse, of at least *src_len bytes.  After the\n+ * function returns, src_buf will be incremented and src_len decremented by the\n+ * number of bytes consumed.\n  *\n  * If src_buffer (or *src_buffer) is NULL, then data is read from the\n  * descriptor \"fd\".\ndiff --git a/remote.c b/remote.c\nindex 5f63d55..f43c7a9 100644\n--- a/remote.c\n+++ b/remote.c\n@@ -1409,7 +1409,7 @@ int match_push_refs(struct ref *src, struct ref **dst,\n \t\t\t\t/*\n \t\t\t\t * Remote doesn't have it, and we have no\n \t\t\t\t * explicit pattern, and we don't have\n-\t\t\t\t * --all nor --mirror.\n+\t\t\t\t * --all or --mirror.\n \t\t\t\t */\n \t\t\t\tgoto free_name;\n \ndiff --git a/sha1_file.c b/sha1_file.c\nindex 6e8c05d..b79efe4 100644\n--- a/sha1_file.c\n+++ b/sha1_file.c\n@@ -787,7 +787,7 @@ void close_pack_index(struct packed_git *p)\n  * contain the same set of objects as an existing one.  In that case\n  * the resulting file might be different even if its name would be the\n  * same.  It is best to close any reference to the old pack before it is\n- * replaced on disk.  Of course no index pointers nor windows for given pack\n+ * replaced on disk.  Of course no index pointers or windows for given pack\n  * must subsist at this point.  If ever objects from this pack are requested\n  * again, the new version of the pack will be reinitialized through\n  * reprepare_packed_git().\ndiff --git a/test-chmtime.c b/test-chmtime.c\nindex 0df7487..dfe8a83 100644\n--- a/test-chmtime.c\n+++ b/test-chmtime.c\n@@ -1,6 +1,6 @@\n /*\n  * This program can either change modification time of the given\n- * file(s) or just print it. The program does not change atime nor\n+ * file(s) or just print it. The program does not change atime or\n  * ctime (their values are explicitly preserved).\n  *\n  * The mtime can be changed to an absolute value:\n-- \n1.9.1.423.g4596e3a\n"},{"id":"238171","messageId":"1396303907-23291-4-git-send-email-jlebar@google.com","threadId":"36325","inReplyTo":"1396303907-23291-1-git-send-email-jlebar@google.com","subject":"[PATCH v5 4/4] Fix misuses of \"nor\" outside comments and in tests","fromName":"Justin Lebar","fromEmail":"jlebar@google.com","sentAt":"2014-03-31T22:11:47Z","receivedAt":"2014-03-31T22:11:47Z","isPatch":true,"sender":{"key":"jlebar@google.com","avatar":"https://gravatar.com/avatar/d902057bd97387117efab9784adbc2208a3d0053c462e0e77c19e4323f23dd91?d=mp&s=160"},"body":"Signed-off-by: Justin Lebar <jlebar@google.com>\n---\n builtin/clean.c                   | 6 +++---\n builtin/commit.c                  | 2 +-\n git-add--interactive.perl         | 4 ++--\n perl/Git/SVN.pm                   | 4 ++--\n sha1_file.c                       | 2 +-\n t/t1001-read-tree-m-2way.sh       | 2 +-\n t/t4005-diff-rename-2.sh          | 2 +-\n t/t4009-diff-rename-4.sh          | 2 +-\n t/t5304-prune.sh                  | 2 +-\n t/t6036-recursive-corner-cases.sh | 2 +-\n t/t7104-reset.sh                  | 2 +-\n t/t9400-git-cvsserver-server.sh   | 2 +-\n 12 files changed, 16 insertions(+), 16 deletions(-)\n\ndiff --git a/builtin/clean.c b/builtin/clean.c\nindex 5502957..977a068 100644\n--- a/builtin/clean.c\n+++ b/builtin/clean.c\n@@ -903,11 +903,11 @@ int cmd_clean(int argc, const char **argv, const char *prefix)\n \n \tif (!interactive && !dry_run && !force) {\n \t\tif (config_set)\n-\t\t\tdie(_(\"clean.requireForce set to true and neither -i, -n nor -f given; \"\n+\t\t\tdie(_(\"clean.requireForce set to true and neither -i, -n, nor -f given; \"\n \t\t\t\t  \"refusing to clean\"));\n \t\telse\n-\t\t\tdie(_(\"clean.requireForce defaults to true and neither -i, -n nor -f given; \"\n-\t\t\t\t  \"refusing to clean\"));\n+\t\t\tdie(_(\"clean.requireForce defaults to true and neither -i, -n, nor -f given;\"\n+\t\t\t\t  \" refusing to clean\"));\n \t}\n \n \tif (force > 1)\ndiff --git a/builtin/commit.c b/builtin/commit.c\nindex 26b2986..5d594a4 100644\n--- a/builtin/commit.c\n+++ b/builtin/commit.c\n@@ -1123,7 +1123,7 @@ static int parse_and_validate_options(int argc, const char *argv[],\n \tif (argc == 0 && only && amend)\n \t\tonly_include_assumed = _(\"Clever... amending the last one with dirty index.\");\n \tif (argc > 0 && !also && !only)\n-\t\tonly_include_assumed = _(\"Explicit paths specified without -i nor -o; assuming --only paths...\");\n+\t\tonly_include_assumed = _(\"Explicit paths specified without -i or -o; assuming --only paths...\");\n \tif (!cleanup_arg || !strcmp(cleanup_arg, \"default\"))\n \t\tcleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE;\n \telse if (!strcmp(cleanup_arg, \"verbatim\"))\ndiff --git a/git-add--interactive.perl b/git-add--interactive.perl\nindex 24bb1ab..32c2f9c 100755\n--- a/git-add--interactive.perl\n+++ b/git-add--interactive.perl\n@@ -1156,9 +1156,9 @@ sub help_patch_cmd {\n \tprint colored $help_color, <<EOF ;\n y - $verb this hunk$target\n n - do not $verb this hunk$target\n-q - quit; do not $verb this hunk nor any of the remaining ones\n+q - quit; do not $verb this hunk or any of the remaining ones\n a - $verb this hunk and all later hunks in the file\n-d - do not $verb this hunk nor any of the later hunks in the file\n+d - do not $verb this hunk or any of the later hunks in the file\n g - select a hunk to go to\n / - search for a hunk matching the given regex\n j - leave this hunk undecided, see next undecided hunk\ndiff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm\nindex 62f3293..a59564f 100644\n--- a/perl/Git/SVN.pm\n+++ b/perl/Git/SVN.pm\n@@ -480,8 +480,8 @@ sub refname {\n \t# It cannot end with a slash /, we'll throw up on this because\n \t# SVN can't have directories with a slash in their name, either:\n \tif ($refname =~ m{/$}) {\n-\t\tdie \"ref: '$refname' ends with a trailing slash, this is \",\n-\t\t    \"not permitted by git nor Subversion\\n\";\n+\t\tdie \"ref: '$refname' ends with a trailing slash; this is \",\n+\t\t    \"not permitted by git or Subversion\\n\";\n \t}\n \n \t# It cannot have ASCII control character space, tilde ~, caret ^,\ndiff --git a/sha1_file.c b/sha1_file.c\nindex b79efe4..77dbb56 100644\n--- a/sha1_file.c\n+++ b/sha1_file.c\n@@ -1123,7 +1123,7 @@ static void report_helper(const struct string_list *list,\n \tconst char *msg;\n \tswitch (seen_bits) {\n \tcase 0:\n-\t\tmsg = \"no corresponding .idx nor .pack\";\n+\t\tmsg = \"no corresponding .idx or .pack\";\n \t\tbreak;\n \tcase 1:\n \t\tmsg = \"no corresponding .idx\";\ndiff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh\nindex acaab07..1731383 100755\n--- a/t/t1001-read-tree-m-2way.sh\n+++ b/t/t1001-read-tree-m-2way.sh\n@@ -18,7 +18,7 @@ In the test, these paths are used:\n         frotz   - not in H added in M\n         nitfol  - in H, stays in M unmodified\n         rezrov  - in H, deleted in M\n-        yomin   - not in H nor M\n+        yomin   - not in H or M\n '\n . ./test-lib.sh\n . \"$TEST_DIRECTORY\"/lib-read-tree.sh\ndiff --git a/t/t4005-diff-rename-2.sh b/t/t4005-diff-rename-2.sh\nindex 77d7f49..7d2c6e1 100755\n--- a/t/t4005-diff-rename-2.sh\n+++ b/t/t4005-diff-rename-2.sh\n@@ -66,7 +66,7 @@ test_expect_success \\\n \n # tree has COPYING and rezrov.  work tree has the same COPYING and\n # copy-edited COPYING.1, and unchanged rezrov.  We should not say\n-# anything about rezrov nor COPYING, since the revised again diff-raw\n+# anything about rezrov or COPYING, since the revised again diff-raw\n # nows how to say Copy.\n \n test_expect_success \\\ndiff --git a/t/t4009-diff-rename-4.sh b/t/t4009-diff-rename-4.sh\nindex f22c8e3..57c094f 100755\n--- a/t/t4009-diff-rename-4.sh\n+++ b/t/t4009-diff-rename-4.sh\n@@ -73,7 +73,7 @@ test_expect_success \\\n \n # tree has COPYING and rezrov.  work tree has the same COPYING and\n # copy-edited COPYING.1, and unchanged rezrov.  We should not say\n-# anything about rezrov nor COPYING, since the revised again diff-raw\n+# anything about rezrov or COPYING, since the revised again diff-raw\n # nows how to say Copy.\n \n test_expect_success \\\ndiff --git a/t/t5304-prune.sh b/t/t5304-prune.sh\nindex 66c9a41..377d3d3 100755\n--- a/t/t5304-prune.sh\n+++ b/t/t5304-prune.sh\n@@ -213,7 +213,7 @@ test_expect_success 'garbage report in count-objects -v' '\n warning: garbage found: .git/objects/pack/fake.bar\n warning: garbage found: .git/objects/pack/foo\n warning: garbage found: .git/objects/pack/foo.bar\n-warning: no corresponding .idx nor .pack: .git/objects/pack/fake2.keep\n+warning: no corresponding .idx or .pack: .git/objects/pack/fake2.keep\n warning: no corresponding .idx: .git/objects/pack/foo.keep\n warning: no corresponding .idx: .git/objects/pack/foo.pack\n warning: no corresponding .pack: .git/objects/pack/fake3.idx\ndiff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh\nindex dfee7d1..a86087b 100755\n--- a/t/t6036-recursive-corner-cases.sh\n+++ b/t/t6036-recursive-corner-cases.sh\n@@ -388,7 +388,7 @@ test_expect_failure 'git detects conflict w/ criss-cross+contrived resolution' '\n \n #\n # criss-cross + d/f conflict via add/add:\n-#   Commit A: Neither file 'a' nor directory 'a/' exist.\n+#   Commit A: Neither file 'a' nor directory 'a/' exists.\n #   Commit B: Introduce 'a'\n #   Commit C: Introduce 'a/file'\n #   Commit D: Merge B & C, keeping 'a' and deleting 'a/'\ndiff --git a/t/t7104-reset.sh b/t/t7104-reset.sh\nindex f136ee7..16faa07 100755\n--- a/t/t7104-reset.sh\n+++ b/t/t7104-reset.sh\n@@ -33,7 +33,7 @@ test_expect_success 'reset --hard should restore unmerged ones' '\n \n '\n \n-test_expect_success 'reset --hard did not corrupt index nor cached-tree' '\n+test_expect_success 'reset --hard did not corrupt index or cached-tree' '\n \n \tT=$(git write-tree) &&\n \trm -f .git/index &&\ndiff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh\nindex 3edc408..1f06e25 100755\n--- a/t/t9400-git-cvsserver-server.sh\n+++ b/t/t9400-git-cvsserver-server.sh\n@@ -512,7 +512,7 @@ test_expect_success 'cvs co -c (shows module database)' '\n # Known issues with git-cvsserver current log output:\n #  - Hard coded \"lines: +2 -3\" placeholder, instead of real numbers.\n #  - CVS normally does not internally add a blank first line\n-#    nor a last line with nothing but a space to log messages.\n+#    or a last line with nothing but a space to log messages.\n #  - The latest cvs 1.12.x server sends +0000 timezone (with some hidden \"MT\"\n #    tagging in the protocol), and if cvs 1.12.x client sees the MT tags,\n #    it converts to local time zone.  git-cvsserver doesn't do the +0000\n-- \n1.9.1.423.g4596e3a\n"},{"id":"238176","messageId":"xmqq7g7a2ec5.fsf@gitster.dls.corp.google.com","threadId":"36325","inReplyTo":"1396303907-23291-4-git-send-email-jlebar@google.com","subject":"Re: [PATCH v5 4/4] Fix misuses of \"nor\" outside comments and in tests","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-03-31T22:27:54Z","receivedAt":"2014-03-31T22:27:54Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Justin Lebar <jlebar@google.com> writes:\n\n> diff --git a/builtin/clean.c b/builtin/clean.c\n> index 5502957..977a068 100644\n> --- a/builtin/clean.c\n> +++ b/builtin/clean.c\n> @@ -903,11 +903,11 @@ int cmd_clean(int argc, const char **argv, const char *prefix)\n>  \n>  \tif (!interactive && !dry_run && !force) {\n>  \t\tif (config_set)\n> -\t\t\tdie(_(\"clean.requireForce set to true and neither -i, -n nor -f given; \"\n> +\t\t\tdie(_(\"clean.requireForce set to true and neither -i, -n, nor -f given; \"\n\nEncouraging Oxford/Harvard comma may or may not be desirable; it\ndoes not seem to be a good idea to mix it in a patch to fix the\nmisuse of \"nor\", I would think.\n\n> diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm\n> index 62f3293..a59564f 100644\n> --- a/perl/Git/SVN.pm\n> +++ b/perl/Git/SVN.pm\n> @@ -480,8 +480,8 @@ sub refname {\n>  \t# It cannot end with a slash /, we'll throw up on this because\n>  \t# SVN can't have directories with a slash in their name, either:\n>  \tif ($refname =~ m{/$}) {\n> -\t\tdie \"ref: '$refname' ends with a trailing slash, this is \",\n> -\t\t    \"not permitted by git nor Subversion\\n\";\n> +\t\tdie \"ref: '$refname' ends with a trailing slash; this is \",\n> +\t\t    \"not permitted by git or Subversion\\n\";\n\nThis s/,/;/ is a good change that would not be controversial.\n"},{"id":"238183","messageId":"xmqqtxae0xe7.fsf@gitster.dls.corp.google.com","threadId":"36325","inReplyTo":"1396303907-23291-1-git-send-email-jlebar@google.com","subject":"Re: [PATCH v5 1/4] Documentation: Fix misuses of \"nor\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-03-31T23:19:12Z","receivedAt":"2014-03-31T23:19:12Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Four patches queued on 'pu' as-is (but retitled).  I didn't read\neverything very carefully, though.\n\nThanks.\n"},{"id":"238229","messageId":"CAMuNMfokH8cVwYmuPX7jY+i6Vp9nPKLS+7rZKUyMvw-8yDOGmQ@mail.gmail.com","threadId":"36325","inReplyTo":"xmqqtxae0xe7.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH v5 1/4] Documentation: Fix misuses of \"nor\"","fromName":"Justin Lebar","fromEmail":"jlebar@google.com","sentAt":"2014-04-01T16:48:25Z","receivedAt":"2014-04-01T16:48:25Z","isPatch":true,"sender":{"key":"jlebar@google.com","avatar":"https://gravatar.com/avatar/d902057bd97387117efab9784adbc2208a3d0053c462e0e77c19e4323f23dd91?d=mp&s=160"},"body":"Thanks a lot, Junio.\n\nIt's unclear to me: Are we done with this patch queue, or do I need to\nworry about getting these patches into another branch?  If the latter,\nI'll update patch v5 per your comments.\n\n-Justin\n\nOn Mon, Mar 31, 2014 at 4:19 PM, Junio C Hamano <gitster@pobox.com> wrote:\n> Four patches queued on 'pu' as-is (but retitled).  I didn't read\n> everything very carefully, though.\n>\n> Thanks.\n"},{"id":"238234","messageId":"xmqqfvlw27nq.fsf@gitster.dls.corp.google.com","threadId":"36325","inReplyTo":"CAMuNMfokH8cVwYmuPX7jY+i6Vp9nPKLS+7rZKUyMvw-8yDOGmQ@mail.gmail.com","subject":"Re: [PATCH v5 1/4] Documentation: Fix misuses of \"nor\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-04-01T19:04:25Z","receivedAt":"2014-04-01T19:04:25Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Justin Lebar <jlebar@google.com> writes:\n\n[administrivia: please do not top-post]\n\n> On Mon, Mar 31, 2014 at 4:19 PM, Junio C Hamano <gitster@pobox.com> wrote:\n>> Four patches queued on 'pu' as-is (but retitled).  I didn't read\n>> everything very carefully, though.\n>>\n>> Thanks.\n>\n> It's unclear to me: Are we done with this patch queue, or do I need to\n> worry about getting these patches into another branch?  If the latter,\n> I'll update patch v5 per your comments.\n\nI didn't read everything very carefully, so I cannot vouch for the\ncorrectness of all the rewrites myself, hence I will not be merging\nit to 'next' or closer-to-release branches with confidence, at least\nnot yet.  Once I hear from somebody else who proof-read the changes\n(or if I find the time to do so myself), I may be able to do so.  Or\nsomebody else (or myself) may find problems with the change and send\nfurther review comments to the list, in which case you would want to\nincorporate them in a reroll, ande the process continues on that new\nversion.\n\nI do not remember there were other comments on the latest version of\nthe series---I suspect not many people had chance to read them yet,\nso we may have to wait for \"further review comments\" for a few days\nat least.\n\nThanks.\n"}]}