Felipe Contreras <felipe.contreras@xxxxxxxxx> writes:
> On Thu, Oct 31, 2013 at 12:11 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
>> Felipe Contreras <felipe.contreras@xxxxxxxxx> 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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html