git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chris Torek <chris.torek@gmail.com>
To: Pooyan Khanjankhani via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Pooyan Khanjankhani <pooyankhan@gmail.com>,
	Pooyan Khanjankhani <p.khanjankhani@digikala.com>
Subject: Re: [PATCH] revisions.txt: correct a mistake in dotted range notations section
Date: Wed, 26 Apr 2023 14:16:28 -0700	[thread overview]
Message-ID: <CAPx1GverCci3SZQEMvFX_q7r3XSTKmPizfcj8QcvGNud7reY9g@mail.gmail.com> (raw)
In-Reply-To: <pull.1485.git.git.1682495081131.gitgitgadget@gmail.com>

On Wed, Apr 26, 2023 at 1:00 AM Pooyan Khanjankhani via GitGitGadget
<gitgitgadget@gmail.com> wrote:
> From: Pooyan Khanjankhani <p.khanjankhani@digikala.com>
>
> Insert a missing 'not' word in a negative sentence.
>   ... but are [not] reachable from neither A or C.

There's a peculiarity of the English language here that means you
should not use the word "not". The actual error is using "or" as
the conjunction, instead of "nor": the construct should read
"neither <alternative 1> nor <alternative 2>", and it means that
both alternatives are rejected.

That said, there's almost certainly a reformulation that uses
language less-confusing to non-native speakers.  Perhaps
this is better (I haven't actually made a commit of this, it's just
a diff in place):

diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index 9aa58052bc..5460820377 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -305,14 +305,14 @@ other, e.g.
     $ git log A..B C..D

 does *not* specify two revision ranges for most commands.  Instead
-it will name a single connected set of commits, i.e. those that are
-reachable from either B or D but are reachable from neither A or C.
-In a linear history like this:
+it will name a single connected set of commits: those that are
+reachable from either B or D, but not reachable from either A or C.
+For example, in a linear history like this:

     ---A---B---o---o---C---D

 because A and B are reachable from C, the revision range specified
-by these two dotted ranges is a single commit D.
+by these two dotted ranges is the single commit D.


 Other <rev>{caret} Parent Shorthand Notations


Chris

  parent reply	other threads:[~2023-04-26 21:16 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-26  7:44 [PATCH] revisions.txt: correct a mistake in dotted range notations section Pooyan Khanjankhani via GitGitGadget
2023-04-26 16:46 ` Junio C Hamano
2023-04-26 21:16 ` Chris Torek [this message]
2023-05-02 16:57   ` Felipe Contreras

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAPx1GverCci3SZQEMvFX_q7r3XSTKmPizfcj8QcvGNud7reY9g@mail.gmail.com \
    --to=chris.torek@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=p.khanjankhani@digikala.com \
    --cc=pooyankhan@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).