Re: [RFD] How to better document the "two and three dots" format

From: Mikael Magnusson <mikachu@gmail.com>
Date: Sep 1, 2008, 12:49 UTC
Message-ID: <237967ef0809010549n72629d47gfdf3c483f1a9e369@mail.gmail.com>
In-Reply-To: <4d8e3fd30809010543o1e1562c1s4466e191e782ddcc@mail.gmail.com>

2008/9/1 Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>:

Show 28 quoted lines

> Hi all,
> I'm looking in the existing documentation about some example and
> clarification about
> the two and three dots formats applied to git diff.
>
> The git-diff.txt file includes the following:
>
> ---8<---
> Comparing branches::
> +
> ------------
> $ git diff topic master    <1>
> $ git diff topic..master   <2>
> $ git diff topic...master  <3>
> ------------
> +
> <1> Changes between the tips of the topic and the master branches.
> <2> Same as above.
> <3> Changes that occurred on the master branch since when the topic
> branch was started off it.
> ---8<---
>
> I think <3> should be changed in something like:
> <3> Changes between the tips of the topic and the master branch that
> occurred since when the topic
> branch was started off it.
>
> What do you think?

Your proposed sentence is incorrect, the diff doesn't involve the tip of topic at all. It shows the diff between the merge-base and the tip of master. Ie, the combined diff of all the commits in the rev-list range topic..master.

Show 8 quoted lines

> I would like to add some graphical representation of <2> and <3> but
> I'm a bit loss
> with <3> (and I guess lot of newbies are not really understanding that point).
> Can anybody come up with some ASCII art?
>
> Thanks.
>
> Ciao,

-- 
Mikael Magnusson