What is the difference between git pull and git fetch + git rebase?

by

It should be pretty obvious from your question that you’re actually just asking about the difference between git merge and git rebase.

So let’s suppose you’re in the common case – you’ve done some work on your master branch, and you pull from origin’s, which also has done some work. After the fetch, things look like this:

- o - o - o - H - A - B - C (master)
               \
                P - Q - R (origin/master)

If you merge at this point (the default behavior of git pull), assuming there aren’t any conflicts, you end up with this:

- o - o - o - H - A - B - C - X (master)
               \             /
                P - Q - R --- (origin/master)

If on the other hand you did the appropriate rebase, you’d end up with this:

- o - o - o - H - P - Q - R - A' - B' - C' (master)
                          |
                          (origin/master)

The content of your work tree should end up the same in both cases; you’ve just created a different history leading up to it. The rebase rewrites your history, making it look as if you had committed on top of origin’s new master branch (R), instead of where you originally committed (H). You should never use the rebase approach if someone else has already pulled from your master branch.

Finally, note that you can actually set up git pull for a given branch to use rebase instead of merge by setting the config parameter branch.<name>.rebase to true. You can also do this for a single pull using git pull --rebase.

More Related Contents:

  1. How do I force "git pull" to overwrite local files?
  2. What does FETCH_HEAD in Git mean?
  3. Why does git say “Pull is not possible because you have unmerged files”?
  4. Is it possible to pull just one file in Git?
  5. GIT pull error – remote object is corrupted
  6. Delete commits from a branch in Git
  7. When do you use Git rebase instead of Git merge?
  8. Git push requires username and password
  9. What exactly does git’s “rebase –preserve-merges” do (and why?)
  10. Git workflow and rebase vs merge questions
  11. Edit the root commit in Git?
  12. How to remove/delete a large file from commit history in the Git repository?
  13. Rename master branch for both local and remote Git repositories
  14. Does “git fetch –tags” include “git fetch”?
  15. Password authentication is temporarily disabled as part of a brownout. Please use a personal access token instead [duplicate]
  16. How to rebase many branches (with the same base commit) at once?
  17. How to rebase local branch onto remote master
  18. In what cases could `git pull` be harmful?
  19. git remove merge commit from history
  20. Choose Git merge strategy for specific files (“ours”, “mine”, “theirs”)
  21. Git rebase fails, ‘Your local changes to the following files would be overwritten by merge’. No local changes?
  22. How can I make my local repository available for git-pull?
  23. Why is git prompting me for a post-pull merge commit message?
  24. GitHub – fatal: could not read Username for ‘https://github.com’: No such file or directory
  25. “fetch –all” in a git bare repository doesn’t synchronize local branches to the remote ones
  26. Remove commit for good
  27. fetch from origin with deleted remote branches?
  28. How to know if there is a git rebase in progress?
  29. How to `git pull` while ignoring local changes?
  30. The following untracked working tree files would be overwritten by merge, but I don’t care

Leave a Comment