Re: [FIXED PATCH] Make rebase save ORIG_HEAD if changing current branch

From: Jakub Narebski <jnareb@gmail.com>
Date: Jul 7, 2008, 22:14 UTC
Message-ID: <m3tzf1e3ze.fsf@localhost.localdomain>
In-Reply-To: <7vod591hlp.fsf@gitster.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

> -- >8 --
> Documentation: update sections on naming revisions and revision ranges

[...]

> While at it, reword the explanation on r1..r2 notation to reduce
> confusion.

> diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
> index 378a312..7184274 100644
> --- a/Documentation/git-rev-parse.txt
> +++ b/Documentation/git-rev-parse.txt

Show 12 quoted lines

> @@ -289,10 +299,10 @@ notation is used.  E.g. "`{caret}r1 r2`" means commits reachable
>  from `r2` but exclude the ones reachable from `r1`.
>  
>  This set operation appears so often that there is a shorthand
> -for it.  "`r1..r2`" is equivalent to "`{caret}r1 r2`".  It is
> -the difference of two sets (subtract the set of commits
> -reachable from `r1` from the set of commits reachable from
> -`r2`).
> +for it.  When you have two commits `r1` and `r2` (named according
> +to the syntax explained in SPECIFYING REVISIONS above), you can ask
> +for commits that are reachable from r2 but not from r1 by
> +"`{caret}r1 r2`" and it can be written as "`r1..r2`".

I'm not sure if the last part is improvement, and it wouldn't be better to say rather than r1..r2 / ^r1 r2 are "commits that are reachable from r2, excluding those commits which are reachable from r1" (which translates into set difference / subtracting set of commits.

-- 
Jakub Narebski
Poland
ShadeHawk on #git