Original: Http://www.tech126.com/git-fetch-pull/Git to get the latest version from the remote branch to the local there are 2 commands:
1. Git fetch: the equivalent of getting the latest version from the remote to the local, does 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 Master Master branch of the remote origin 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 the following clearer way:
Git fetch Origin master:tmp
GIT diff tmp
Git merge tmp Gets the latest version remotely from the local test branch
Then compare the merge
2. Git pull: the equivalent of getting the latest version from the remote and merge to the local
Git pull Origin Master the above command is actually equivalent to git fetch and git merge
In actual use, git fetch is more secure
Because before we merge, we can look at the update and then decide if the merge is over.