From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 31 Oct 2013 20:43:35 +0000 (-0700)
Subject: doc/pull: clarify the illustrations
X-Git-Tag: v1.8.5-rc1~1^2~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5a3fd6afd4a26accc20a58bf4980f296772be98a?hp=5a3fd6afd4a26accc20a58bf4980f296772be98a

doc/pull: clarify the illustrations

The second illustration that shows the history after "git pull"
spelled the remote-tracking branch with "remotes/" prefix, which
is not necessary.  Drop it.

To match the assumption that a remote-tracking branch is used to
keep track of the advancement of the master at the origin, update
the first illustration that shows the history before "git pull"
to show the distinction between the master currently at origin and
the stale origin/master remote-tracking branch.

Noticed-by: Felipe Contreras <felipe.contreras@gmail.com>
Helped-by: Max Horn <max@quendi.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---