| Message ID | 295fdc1cd32cffcef145d9dd0ac76d29580fa6de.1612431093.git.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Range diff with ranges lacking dotdot | expand |
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes: > From: Johannes Schindelin <johannes.schindelin@gmx.de> > > There are three forms, depending whether the user specifies one, two or > three non-option arguments. We've never actually explained how this > works in the manual, so let's explain it. > > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> > --- > Documentation/git-range-diff.txt | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/Documentation/git-range-diff.txt b/Documentation/git-range-diff.txt > index 9701c1e5fdd5..14bffb272a06 100644 > --- a/Documentation/git-range-diff.txt > +++ b/Documentation/git-range-diff.txt > @@ -28,6 +28,18 @@ Finally, the list of matching commits is shown in the order of the > second commit range, with unmatched commits being inserted just after > all of their ancestors have been shown. > > +There are three ways to specify the commit ranges: > + > +- `<range1> <range2>`: Either commit range can be of the form > + `<base>..<rev>`, `<rev>^!` or `<rev>^-<n>`. See `SPECIFYING RANGES` > + in linkgit:gitrevisions[7] for more details. > + > +- `<rev1>...<rev2>`. This resembles the symmetric ranges mentioned in > + the `SPECIFYING RANGES` section of linkgit:gitrevisions[7], and is > + equivalent to `<rev2>..<rev1> <rev1>..<rev2>`. As I said before, this _is_ a symmetric range that has commits reachable from rev1 but not from rev2 on the left hand side, and commits reachable from rev2 but not from rev1 on the right hand side, not just something else that resembles a symmetric range. > +- `<base> <rev1> <rev2>`: This is equivalent to `<base>..<rev1> > + <base>..<rev2>`. > > OPTIONS > -------
Hi Junio, On Thu, 4 Feb 2021, Junio C Hamano wrote: > "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> > writes: > > > From: Johannes Schindelin <johannes.schindelin@gmx.de> > > > > There are three forms, depending whether the user specifies one, two or > > three non-option arguments. We've never actually explained how this > > works in the manual, so let's explain it. > > > > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> > > --- > > Documentation/git-range-diff.txt | 12 ++++++++++++ > > 1 file changed, 12 insertions(+) > > > > diff --git a/Documentation/git-range-diff.txt b/Documentation/git-range-diff.txt > > index 9701c1e5fdd5..14bffb272a06 100644 > > --- a/Documentation/git-range-diff.txt > > +++ b/Documentation/git-range-diff.txt > > @@ -28,6 +28,18 @@ Finally, the list of matching commits is shown in the order of the > > second commit range, with unmatched commits being inserted just after > > all of their ancestors have been shown. > > > > +There are three ways to specify the commit ranges: > > + > > +- `<range1> <range2>`: Either commit range can be of the form > > + `<base>..<rev>`, `<rev>^!` or `<rev>^-<n>`. See `SPECIFYING RANGES` > > + in linkgit:gitrevisions[7] for more details. > > + > > +- `<rev1>...<rev2>`. This resembles the symmetric ranges mentioned in > > + the `SPECIFYING RANGES` section of linkgit:gitrevisions[7], and is > > + equivalent to `<rev2>..<rev1> <rev1>..<rev2>`. > > As I said before, this _is_ a symmetric range that has commits > reachable from rev1 but not from rev2 on the left hand side, and > commits reachable from rev2 but not from rev1 on the right hand > side, not just something else that resembles a symmetric range. If we were talking about one commit range instead of two, I would agree with you. To put an end to this pointless discussion, I struck the sentence from the documentation. It might even make it easier to read for users. So that's a win. Ciao, Dscho > > +- `<base> <rev1> <rev2>`: This is equivalent to `<base>..<rev1> > > + <base>..<rev2>`. > > > > OPTIONS > > ------- >
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes: >> As I said before, this _is_ a symmetric range that has commits >> reachable from rev1 but not from rev2 on the left hand side, and >> commits reachable from rev2 but not from rev1 on the right hand >> side, not just something else that resembles a symmetric range. > > If we were talking about one commit range instead of two, I would agree > with you. It is one symmetric commit range A...B that has two sides, i.e. B..A on the left side and A..B on the right side.
diff --git a/Documentation/git-range-diff.txt b/Documentation/git-range-diff.txt index 9701c1e5fdd5..14bffb272a06 100644 --- a/Documentation/git-range-diff.txt +++ b/Documentation/git-range-diff.txt @@ -28,6 +28,18 @@ Finally, the list of matching commits is shown in the order of the second commit range, with unmatched commits being inserted just after all of their ancestors have been shown. +There are three ways to specify the commit ranges: + +- `<range1> <range2>`: Either commit range can be of the form + `<base>..<rev>`, `<rev>^!` or `<rev>^-<n>`. See `SPECIFYING RANGES` + in linkgit:gitrevisions[7] for more details. + +- `<rev1>...<rev2>`. This resembles the symmetric ranges mentioned in + the `SPECIFYING RANGES` section of linkgit:gitrevisions[7], and is + equivalent to `<rev2>..<rev1> <rev1>..<rev2>`. + +- `<base> <rev1> <rev2>`: This is equivalent to `<base>..<rev1> + <base>..<rev2>`. OPTIONS -------