Original article: http://www.tech126.com/git-fetch-pull/
Git obtains the latest version from a remote Branch to a local machine with the following two commands:
1. Git
Fetch: equivalent to obtaining the latest version from a remote device to a local device.
git fetch origin master
git log -p master..origin/master
git merge origin/master
Meaning of the preceding command:
First, download the latest version from the 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
Merge at last
The above process can be implemented in the following clearer ways:
git fetch origin master:tmp
git diff tmp
git merge tmp
Remotely obtain the latest version to the local test Branch
And then compare and merge
2. Git
Pull: equivalent to remotely obtaining the latest version and merge to the local device.
git pull origin master
The above commands are actually equivalent to git fetch and git merge
In practice, git fetch is safer
Because before merge, we can check the Update Status and then decide whether to end the merge.