difference between git merge origin/master and git pull

fetch, merge, and pull

git fetch and git merge origin/master will fetch & integrate remote changes. Let me explain a common scenario. origin/master is at C. Someone pushed D. You worked on E & F. Note that you will not see D in your local repository until you run git fetch.

   origin/master
    v
A-B-C-E-F < master
     \
     (D) < master on remote

Now you run git fetch. Now you can see D, and origin/master is updated to match the remote repository that it’s tracking.

A-B-C-E-F < master
     \
      D < origin/master, master on remote

Now you run git merge, giving you this:

A-B-C-E-F
     \   \
      D---G < master
      ^
    origin/master, master on remote

So now you’ve integrated your changes on master (E, F) with the new commits on origin/master (D).

git pull is simply a shortcut for the above steps.

git merge without fetching

Running git merge origin/master without the git fetch is pointless. Without a git fetch, your local repository is unaware of any potential changes on the remote repository and origin/master will not have moved. So you’re at this state, where D is only on the remote and not present locally:

   origin/master
    v
A-B-C-E-F < master
     \
     (D) < master on remote

Since your local repository does not have D, a git merge origin/master will simply yield:

Already up-to-date.

Because hey, as far as your local repository is concerned, master already has everything in origin/master.

What’s best?

None of the above. 🙂

git fetch
git rebase origin/master master

or a shortcut, git pull -r, but personally I prefer to see the changes before I rebase.
This will replay your changes on master (E, F) on top of origin/master (D) without a yucky merge commit. It yields:

A-B-C-D-E'-F' < master
      ^
   origin/master, master on remote

Note how everything is in a single line, you’re ready to push, and the history doesn’t look like a friendship bracelet.

One warning – never rebase any commits that have already been pushed. Note that E & F became E’ & F’ after rebasing. The commits are entirely rewritten, with a new SHA and everything. If you rebase commits that are already public, developers will have their history re-written for them when they pull. And that’s awful, and everyone will give you evil eyes and shun you.

Related Posts:

  1. How do I discard unstaged changes in Git?
  2. Git: How do I force “git pull” to overwrite local files?
  3. How can I make git accept a self signed certificate?
  4. How can I revert multiple Git commits (already pushed) to a published repository?
  5. What is the difference between ‘git pull’ and ‘git fetch’?
  6. Git: cannot do a partial commit during a merge (SourceTree)
  7. Git: How do I force “git pull” to overwrite local files?
  8. What is the meaning of git reset –hard origin/master?
  9. Why does ‘git commit’ not save my changes?
  10. How can I undo git reset –hard HEAD~1?
  11. git push to specific branch
  12. Get changes from master into branch in Git
  13. Updates were rejected because the remote contains work that you do not have locally
  14. Rebasing remote branches in Git
  15. What is the Git equivalent for revision number?
  16. What’s a good (free) visual merge tool for Git? (on windows)
  17. How do I delete a Git branch locally and remotely?
  18. How do I delete a Git branch locally and remotely?
  19. How do I rename a local Git branch?
  20. How do I undo the most recent local commits in Git?
  21. How to merge branch to master?
  22. Git: How do I force “git pull” to overwrite local files?
  23. Differences between git pull origin master & git pull origin/master
  24. How do I rename a local Git branch?
  25. How can I switch to another branch in git?
  26. How do I discard unstaged changes in Git?
  27. Download single files from GitHub
  28. Git: How to squash all commits on branch
  29. The following untracked working tree files would be overwritten by merge, but I don’t care
  30. The following untracked working tree files would be overwritten by merge, but I don’t care
  31. Undo git pull, how to bring repos to old state
  32. merge one local branch into another local branch
  33. What does “Git push non-fast-forward updates were rejected” mean?
  34. Undo git pull, how to bring repos to old state
  35. How can I reset or revert a file to a specific revision?
  36. Else clause on Python while statement
  37. What is the difference between `git merge` and `git merge –no-ff`?
  38. The following untracked working tree files would be overwritten by merge, but I don’t care
  39. Delete all local git branches
  40. Git merge with force overwrite
  41. Set up git to pull and push all branches
  42. Invalid VCS root mapping – 3 errors on my project
  43. how to reset develop branch to master
  44. Do I commit the package-lock.json file created by npm 5?
  45. Why does Git say my master branch is “already up to date” even though it is not?
  46. How to resolve git status “Unmerged paths:”?
  47. How can I see the changes in a Git commit?
  48. How do you merge two Git repositories?
  49. Git merge reports “Already up-to-date” though there is a difference
  50. How to merge a specific commit in Git
  51. How can I delete all Git branches which have been merged?
  52. Eclipse EGit Checkout conflict with files: – EGit doesn’t want to continue
  53. Getting Started with Subversion, Git, or similar Version Control System to keep a History of my Files? [closed]
  54. Should I use SVN or Git?
  55. WordPress Health Tool reporting version control as a critical issue
  56. storing database in version control
  57. Is it better to create a Git repository at the root level or in the WordPress theme directory?
  58. Pull latest stable release via git [closed]
  59. How should I be handling my theme version numbering?
  60. Version control with a team of non-developers
  61. Painless way to track remote Git repo for WordPress updates
  62. Questions about Git and WordPress [duplicate]
  63. How to rename the wp-config.php file once under version control?
  64. How to use one git (github) repository for version control for multiple themes
  65. version control for wordpress? (wordpress folder and database at same time)
  66. Revision History for Entire WordPress Site
  67. WordPress and Git: How does Git interact with your IDE? [closed]
  68. Git: Message ‘src refspec master does not match any’ when pushing commits in Git
  69. How to upgrade Git on Windows to the latest version
  70. How do I push a new local branch to a remote Git repository and track it too?
  71. ‘git’ is not recognized as an internal or external command
  72. git: fatal: Could not read from remote repository
  73. Windows git “warning: LF will be replaced by CRLF”, is that warning tail backward?
  74. Untrack files from git temporarily
  75. You have not concluded your merge (MERGE_HEAD exists)
  76. git – pulling from specific branch
  77. How to copy commits from one branch to another?
  78. gpg failed to sign the data fatal: failed to write commit object
  79. How to resolve git’s “not something we can merge” error
  80. Git nothing added to commit but untracked files present – even with those files added to gitignore
  81. git: How to ignore all present untracked files?
  82. Move existing, uncommitted work to a new branch in Git
  83. Git Update Local Branch with remote Master
  84. How can I delete all of my Git stashes at once?
  85. What are the differences between “git commit” and “git push”?
  86. Repository is not clean. Please commit or stash any changes before updating In Angular 8
  87. Github Windows ‘Failed to sync this branch’
  88. How to get Git to clone into current directory
  89. GIT_DISCOVERY_ACROSS_FILESYSTEM not set
  90. key_load_public: invalid format
  91. [npm notice created a lockfile as package-lock.json. You should commit this file
  92. How can I sync WordPress plugin settings between environments?
  93. WP plugin management
  94. Different color admin bars for dev, staging and production
  95. best practice on pushing staging development (database/uploads) to the live server
  96. How can I edit commit messages in my wp-hosted plugin repo?
  97. Can plugin2 uninstall plugin1 at the very beginning of plugin2’s installation?
  98. Contact Form 7 – Replace database configured form template with a static file
  99. theme continuous deployment from bitbucket to windows azure
  100. how can I create a WP offline environment before releasing the websites? [closed]

Leave a Comment