Git：在此Git速查表的背景下，获取与拉取

Question

I'm understanding the difference between a git fetch and git pull (the former leaves local branch untouched, the latter merges changes into local branch), but I'm bit confused about this cheat sheet:

There is an arrow directly underneath "fetch", which makes it look like fetch and pull are identical functions. From what I understand, only the bottom-most arrow should be "pull". Does anyone else agree that the arrow below "fetch" shouldn't be there? If it should, can you please explain why?

Answer 1

Pull belongs to both arrows (the ones it borders). Pull includes a fetch; it updates your local repository (same as fetch) and it also updates your local workspace.

Answer 2

What it is trying to say with the arrow beneath the fetch is that when you do a pull , you update both the local repo as well as the workspace. Hence, a pull both for local repo & workspace.

A git pull is basically a git fetch & git merge .

Here is Oliver Steele's image of how all it all fits together :

Link to follow.

Answer 3

Both fetch and merge sync remote repo to local repo which is what diagram conveys. So its correct as per diagram. As you mentioned, former don't merge and later merge is after syncing to local repo.

Answer 4

From git docs :

Incorporates changes from a remote repository into the current branch. In its default mode, git pull is shorthand for git fetch followed by git merge FETCH_HEAD. More precisely, git pull runs git fetch with the given parameters and calls git merge to merge the retrieved branch heads into the current branch. With --rebase, it runs git rebase instead of git merge.

So git pull do two work first git fetch and second git merge. Fetch update your local repository and merge update your working directory. So both arrows represent pull is fine.