From: Max Horn <max@quendi.de>
Date: Thu, 31 Oct 2013 19:27:19 GMT
Subject: Re: [PATCH 03/16] pull: cleanup documentation
Message-ID: <ADB546B4-992E-4B54-953E-B721BECD19B2@quendi.de>
In-Reply-To: <xmqqob655kqi.fsf@gitster.dls.corp.google.com>


On 31.10.2013, at 20:00, Junio C Hamano <gitster@pobox.com> wrote:

> Felipe Contreras <felipe.contreras@gmail.com> writes:

[...]

> 
>> 
>> If you want to be pedantic, this is the "reality":
>> 
>>  ------------
>>      D---E---F---G master
>>  ------------
> 
> You are wrong again.  The "reality" is more like this:
> 
>      origin/master in your repository
>      |
>      v
>      A---B---C master at origin
>     /
>    D---E---F---G master in your repository
> 
> if you really want to write origin/master somewhere in this
> illustration.

Actually, I kind of like that. After just reading the existing phrasing in git-pull.txt, I doubt that a newbie would catch the difference between "origin/master" and "master at origin". With this illustration, it's very clearly conveyed that there is a difference.