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

From: Daniël Gressmann <daniel@procura.nl>
Date: Sep 1, 2008, 13:01 UTC
Message-ID: <48BBE7B6.9070709@procura.nl>
In-Reply-To: <4d8e3fd30809010543o1e1562c1s4466e191e782ddcc@mail.gmail.com>

Paolo Ciarrocchi wrote:

> 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.

I think it's a step in the proper direction. My take, as a newbie ;), at it would be more like:

<3> Changes between the current tip of the topic and the tip of master branch at the moment the topic branched off.

I think the ASCII art explains why I think that way.

> Can anybody come up with some ASCII art?
>

ASCII art <1> or <2>:
--o--x
   \
    -x

ASCII art <3>:

--x---
   \
    -x

where the x marks the changes to be diffed

-- 
PROCURA B.V.

Tel: (072) 571 25 05
Fax: (072) 571 71 02

Email: daniel@procura.nl

PROCURA B.V. (statutair gevestigd in Heerhugowaard),
Handelsregister Kamer van Koophandel Noordwest-Holland: 37140650