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.
If you want to be pedantic, this is the "reality":
------------
D---E---F---G master
------------
--
Felipe Contreras
--
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