Skip to content

Commit 84ffb5b

Browse files
committed
Merge pull request progit#538 from YueLinHo/fix_i530
Fix issue progit#530: Explaining `fetch` command via the word "pull" may confuses the newbie
2 parents 1f2b9ae + 26f85d6 commit 84ffb5b

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
@@ -112,7 +112,7 @@ After you do this, you should have references to all the branches from that remo
112112

113113
If you clone a repository, the command automatically adds that remote repository under the name ``origin''.
114114
So, `git fetch origin` fetches any new work that has been pushed to that server since you cloned (or last fetched from) it.
115-
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.
115+
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.
116116
You have to merge it manually into your work when you're ready.
117117

118118
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)))
@@ -133,7 +133,7 @@ $ git push origin master
133133

134134
This command works only if you cloned from a server to which you have write access and if nobody has pushed in the meantime.
135135
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.
136-
You'll have to pull down their work first and incorporate it into yours before you'll be allowed to push.
136+
You'll have to fetch their work first and incorporate it into yours before you'll be allowed to push.
137137
See <<_git_branching>> for more detailed information on how to push to remote servers.
138138

139139
[[_inspecting_remote]]

0 commit comments

Comments
 (0)