From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 31 Oct 2013 19:42:26 GMT
Subject: Re: [PATCH 03/16] pull: cleanup documentation
Message-ID: <xmqqzjpp447x.fsf@gitster.dls.corp.google.com>
In-Reply-To: <ADB546B4-992E-4B54-953E-B721BECD19B2@quendi.de>

Max Horn <max@quendi.de> writes:

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

Yeah, after re-reading the part of the documentation with the
illustration replaced with the above, I was coming to the same
conclusion.