git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 2/6] contrib: Fix misuses of "nor"

From
Justin Lebar <jlebar@google.com>
Date
Mar 15, 2014, 08:41 UTC
Message-ID
<1394872922-2000-3-git-send-email-jlebar@google.com>
In-Reply-To
<1394872922-2000-1-git-send-email-jlebar@google.com>
Signed-off-by: Justin Lebar <jlebar@google.com>
---
 contrib/examples/git-commit.sh | 2 +-
 contrib/svn-fe/svn-fe.txt      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/examples/git-commit.sh b/contrib/examples/git-commit.sh
index 23ffb02..4aab1a6 100755
--- a/contrib/examples/git-commit.sh
+++ b/contrib/examples/git-commit.sh
@@ -280,7 +280,7 @@ case "$#,$also,$only,$amend" in
 0,,,*)
 	;;
 *,,,*)
-	only_include_assumed="# Explicit paths specified without -i nor -o; assuming --only paths..."
+	only_include_assumed="# Explicit paths specified without -i or -o; assuming --only paths..."
 	also=
 	;;
 esac
diff --git a/contrib/svn-fe/svn-fe.txt b/contrib/svn-fe/svn-fe.txt
index 1128ab2..a3425f4 100644
--- a/contrib/svn-fe/svn-fe.txt
+++ b/contrib/svn-fe/svn-fe.txt
@@ -40,8 +40,8 @@ manual page.
 NOTES
 -----
 Subversion dumps do not record a separate author and committer for
-each revision, nor a separate display name and email address for
-each author.  Like git-svn(1), 'svn-fe' will use the name
+each revision, nor do they record a separate display name and email
+address for each author.  Like git-svn(1), 'svn-fe' will use the name
 
 ---------
 user <user@UUID>
-- 
1.9.0.279.gdc9e3eb
Previous: Justin LebarNext: Justin Lebar
Message 3 of 12 in “Fix misuses of "nor"”
  1. 0/6 Fix misuses of "nor"Justin Lebar, Mar 15, 2014
  2. 1/6 Documentation: Fix misuses of "nor"Justin Lebar, Mar 15, 2014
  3. 2/6 contrib: Fix misuses of "nor"Justin Lebar, Mar 15, 2014
  4. 3/6 l10n: Fix misuses of "nor"Justin Lebar, Mar 15, 2014
  5. Jiang XinMar 17, 2014
  6. Justin LebarMar 17, 2014
  7. 4/6 Fix misuses of "nor" in commentsJustin Lebar, Mar 15, 2014
  8. 5/6 Fix misuses of "nor" outside commentsJustin Lebar, Mar 15, 2014
  9. 6/6 Tests: Fix misuses of "nor"Justin Lebar, Mar 15, 2014
  10. Duy NguyenMar 15, 2014
  11. Justin LebarMar 15, 2014
  12. Duy NguyenMar 15, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.