From: Felipe Contreras <felipe.contreras@gmail.com>
To: Bagas Sanjaya <bagasdotme@gmail.com>,
Felipe Contreras <felipe.contreras@gmail.com>,
git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] doc: revisions: improve single range explanation
Date: Sat, 12 Jun 2021 22:12:41 -0500 [thread overview]
Message-ID: <60c577a9a1a71_3c23a208ed@natae.notmuch> (raw)
In-Reply-To: <4067f10f-067f-6475-8305-2e10631388c6@gmail.com>
Bagas Sanjaya wrote:
> On 13/06/21 07.44, Felipe Contreras wrote:
> > The original explanation didn't seem clear enough to some people.
> >
> > Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> > ---
> > Documentation/revisions.txt | 22 +++++++++++-----------
> > 1 file changed, 11 insertions(+), 11 deletions(-)
> >
> > diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
> > index f5f17b65a1..d8cf512686 100644
> > --- a/Documentation/revisions.txt
> > +++ b/Documentation/revisions.txt
> > @@ -299,22 +299,22 @@ empty range that is both reachable and unreachable from HEAD.
> >
> > Commands that are specifically designed to take two distinct ranges
> > (e.g. "git range-diff R1 R2" to compare two ranges) do exist, but
> > -they are exceptions. Unless otherwise noted, all "git" commands
> > +they are exceptions. Unless otherwise noted, all git commands
> > that operate on a set of commits work on a single revision range.
> > -In other words, writing two "two-dot range notation" next to each
> > -other, e.g.
> >
> > - $ git log A..B C..D
> > +For example, if you have a linear history like this:
> >
> > -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:
> > + ---A---B---C---D---E---F
> >
> > - ---A---B---o---o---C---D
> > +Doing A..F will retrieve 5 commits, and doing B..E will retrieve 3
> > +commits, but doing A..F B..E will not retrieve two revision ranges
> > +totalling 8 commits. Instead the starting point A gets overriden by B,
> > +and the ending point of E by F, effectively becoming B..F, a single
> > +revision range.
>
> AFAIK, A..F means all commits from A to F. But in case of branched
> history like
>
> ---A---B---C---G---H---I <- main
> \
> ---D---E---F <- mybranch
>
> the notation main..mybranch means all commits that are reachable from
> mybranch but not from main, but the opposite (mybranch..main) means the
> opposite!
>
> So basically the right-hand side of two dot notation specifies from what
> commit I want to select the range, and the left-hand side specifies the
> commit which I don't want to reach.
Yes, `A..F` is the same as `^A F`.
--
Felipe Contreras
next prev parent reply other threads:[~2021-06-13 3:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-13 0:44 [PATCH] doc: revisions: improve single range explanation Felipe Contreras
2021-06-13 2:50 ` Bagas Sanjaya
2021-06-13 3:12 ` Felipe Contreras [this message]
2021-06-13 3:32 ` Eric Sunshine
2021-06-13 4:25 ` Felipe Contreras
2021-06-13 7:02 ` Elijah Newren
2021-06-13 17:09 ` Felipe Contreras
2021-06-14 14:39 ` Elijah Newren
2021-06-15 11:53 ` Felipe Contreras
2021-06-13 8:11 ` Eric Sunshine
2021-06-13 16:13 ` 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=60c577a9a1a71_3c23a208ed@natae.notmuch \
--to=felipe.contreras@gmail.com \
--cc=bagasdotme@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=sunshine@sunshineco.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).