Skip to content

Commit 5a3fd6a

Browse files
committed
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 <[email protected]> Helped-by: Max Horn <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 501a75a commit 5a3fd6a

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Documentation/git-pull.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ Assume the following history exists and the current branch is
4242
A---B---C master on origin
4343
/
4444
D---E---F---G master
45+
^
46+
origin/master in your repository
4547
------------
4648

4749
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
5153
and a log message from the user describing the changes.
5254

5355
------------
54-
A---B---C remotes/origin/master
56+
A---B---C origin/master
5557
/ \
5658
D---E---F---G---H master
5759
------------

0 commit comments

Comments
 (0)