On 31.10.2013, at 20:00, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Felipe Contreras <felipe.contreras@xxxxxxxxx> 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.
Attachment:
signature.asc
Description: Message signed with OpenPGP using GPGMail