Skip to content

Commit 26f85d6

Browse files
committed
Fix issue progit#530: Explaining fetch command via the word "pull" may confuses the newbie
1 parent 6346b40 commit 26f85d6

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

book/02-git-basics/sections/remotes.asc

+2-2
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ After you do this, you should have references to all the branches from that remo
111111

112112
If you clone a repository, the command automatically adds that remote repository under the name ``origin''.
113113
So, `git fetch origin` fetches any new work that has been pushed to that server since you cloned (or last fetched from) it.
114-
It's important to note that the `git fetch` command pulls the data to your local repository – it doesn't automatically merge it with any of your work or modify what you're currently working on.
114+
It's important to note that the `git fetch` command only downloads the data to your local repository – it doesn't automatically merge it with any of your work or modify what you're currently working on.
115115
You have to merge it manually into your work when you're ready.
116116

117117
If your current branch is set up to track a remote branch (see the next section and <<_git_branching>> for more information), you can use the `git pull` command to automatically fetch and then merge that remote branch into your current branch.(((git commands, pull)))
@@ -132,7 +132,7 @@ $ git push origin master
132132

133133
This command works only if you cloned from a server to which you have write access and if nobody has pushed in the meantime.
134134
If you and someone else clone at the same time and they push upstream and then you push upstream, your push will rightly be rejected.
135-
You'll have to pull down their work first and incorporate it into yours before you'll be allowed to push.
135+
You'll have to fetch their work first and incorporate it into yours before you'll be allowed to push.
136136
See <<_git_branching>> for more detailed information on how to push to remote servers.
137137

138138
[[_inspecting_remote]]

0 commit comments

Comments
 (0)