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>
Junio C Hamano committed
Oct 31, 2013 at 13:43 UTC
5a3fd6afd4a26accc20a58bf4980f296772be98a
1 file changed
+3
-1
Documentation/git-pull.txt
+3
-1
@@ -42,6 +42,8 @@ Assume the following history exists and the current branch is
42
A---B---C master on origin
43
/
44
D---E---F---G master
45
+ ^
46
+ origin/master in your repository
47
------------
48
49
Then "`git pull`" will fetch and replay the changes from the remote
@@ -51,7 +53,7 @@ result in a new commit along with the names of the two parent commits
53
and a log message from the user describing the changes.
54
55
------------
54
- A---B---C remotes/origin/master
56
+ A---B---C origin/master
57
/ \
58
D---E---F---G---H master
59
------------