revisions.txt: correct a mistake in dotted range notations section
PATCH 1/1 revisions.txt: correct a mistake in dotted range notations section
From: Pooyan Khanjankhani <[email protected]>
Insert a missing 'not' word in a negative sentence.
... but are [not] reachable from neither A or C.
---
docs: Fix sentencing
Just fixed a sentence in docs.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1485%2FTheKhanj%2Fdocs%2Fsentencing-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1485/TheKhanj/docs/sentencing-v1
Pull-Request: https://github.com/git/git/pull/1485
Documentation/revisions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/revisions.txt +1 -1
@@ -306,7 +306,7 @@ other, e.g. 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. +reachable from either B or D but are not reachable from neither A or C. In a linear history like this: ---A---B---o---o---C---D
base-commit: ae73b2c8f1da39c39335ee76a0f95857712c22a7
Signature · 1 line
gitgitgadget
"Pooyan Khanjankhani via GitGitGadget" <[email protected]>
Quoted 10 lines · writes:
$ git log A..B C..Ddoes *not* specify two revision ranges for most commands. Instead it will name a single connected set of commits, i.e. those that are
Documentation/revisions.txt +1
-1-reachable from either B or D but are reachable from neither A or C. +reachable from either B or D but are not reachable from neither A or C. In a linear history like this: ---A---B---o---o---C---D
Quoted 2 lines
because A and B are reachable from C, the revision range specified by these two dotted ranges is a single commit D.
Isn't that an unwanted double negative?
The first hit I got about "neither double negation" on Google search was:
https://www.grammar-monster.com/lessons/either_or_neither_nor_double_negative.htm
but the source of this might sound more authoritative:
https://dictionary.cambridge.org/grammar/british-grammar/neither-neither-nor-and-not-either_2
Quoted 4 lines · Pooyan Khanjankhani via GitGitGadget
From: Pooyan Khanjankhani <[email protected]>
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):
Documentation/revisions.txt +4 -4
@@ -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
Quoted 4 lines · Chris Torek
Quoted 2 lines · Pooyan Khanjankhani via GitGitGadget
From: Pooyan Khanjankhani <[email protected]>
Quoted 8 lines
Quoted 2 lines
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.
But it's not the same to say "not reachable from either A or C", and "reachable from neither A nor C". In the latter if a commit is reachable from X (or anything other than A or C), it should be included.
So A~ would be included, because it's reachable from B and reachable from not A (i.e. B).
It should be "not reachable from either A or C".
Cheers.
Signature · 1 line
Felipe Contreras