Subject: Re: [PATCH 03/16] pull: cleanup documentation

From: Junio C Hamano <[email-masked]>
Date: Thu, 31 Oct 2013 12:00:21 -0700

Felipe Contreras <[email-masked]> writes:

> On Thu, Oct 31, 2013 at 12:11 PM, Junio C Hamano <[email-masked]> wrote:
>> Felipe Contreras <[email-masked]> writes:
>
>>> --- a/Documentation/git-pull.txt
>>> +++ b/Documentation/git-pull.txt
>>> @@ -39,7 +39,7 @@ Assume the following history exists and the current branch is
>>>  "`master`":
>>>
>>>  ------------
>>> -       A---B---C master on origin
>>> +       A---B---C origin/master
>>>        /
>>>      D---E---F---G master
>>>  ------------
>>
>> This change is wrong; the illustration depicts the distributed world
>> (i.e. a fetch has not happened yet).
>
> That is an irrelevant implementation detail, specially at this high
> level. In the user's mind origin/master means master on origin.

You are wrong.  In the user's mind, origin/master means the commit
that used to be at master on origin, and the point of this
illustration is to make them understand that they live in a
distributed world, where their last observation will go stale over
time.

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