Original: Http://www.tech126.com/git-fetch-pull/Git from the remote branch to get the latest version to the local have such 2 commands:
1. Git fetch: the equivalent of getting the latest version from remote to local, not automatically merge
Git fetch Origin Master
Git log-p master: Origin/master
git merge Origin/master The meaning of the above command:
First download the latest version from the Remote Origin master branch to the Origin/master branch
Then compare the differences between the local master branch and the Origin/master branch
The final merge
The above process can actually be done in a clearer way:
Git fetch Origin master:tmp git diff tmp git merge tmp Get Latest version from remote to local test branch
Then compare the merge
2. Git pull: the equivalent of getting the latest version from remote and merge to local
Git pull Origin Master the above commands are actually equivalent to git fetch and git merge
Git fetch is more secure in real-world use
Because before the merge, we can review the update and then decide whether the merge ends