How to rebase local branch onto remote master

by

First fetch the new master from the upstream repository, then rebase your work branch on that:

git fetch origin            # Updates origin/master
git rebase origin/master    # Rebases current branch onto origin/master

Update: Please see Paul Draper’s answer for a more concise way to do the same – recent Git versions provide a simpler way to do the equivalent of the above two commands.

More Related Contents:

  1. Delete commits from a branch in Git
  2. What exactly does git’s “rebase –preserve-merges” do (and why?)
  3. Git workflow and rebase vs merge questions
  4. What is the difference between merge –squash and rebase?
  5. How to squash all git commits into one?
  6. Edit the root commit in Git?
  7. Insert a commit before the root commit in Git?
  8. How to convert a Git shallow clone to a full clone?
  9. How to git rebase a branch with the onto command?
  10. How to inject a commit between some two arbitrary commits in the past?
  11. How to rebase many branches (with the same base commit) at once?
  12. Rebasing a Git merge commit
  13. Squash the first two commits in Git? [duplicate]
  14. git remove merge commit from history
  15. git rebase basics
  16. When git rebasing two branches with some shared history, is there an easy way to have the common history remain common?
  17. Choose Git merge strategy for specific files (“ours”, “mine”, “theirs”)
  18. Git rebase fails, ‘Your local changes to the following files would be overwritten by merge’. No local changes?
  19. How do I squash two non-consecutive commits?
  20. How do I select a merge strategy for a git rebase?
  21. How do I git rebase the first commit?
  22. Git interactive rebase without opening the editor
  23. git rebase: “error: cannot stat ‘file’: Permission denied”
  24. Git: How to rebase to a specific commit?
  25. git rebase merge conflict
  26. How to know if there is a git rebase in progress?
  27. git clone fails with “index-pack” failed?
  28. Git rebase branch with all parent branches (or dependent sub-branches)
  29. What does “Auto packing the repository for optimum performance” mean?
  30. Git rebase –preserve-merges fails

Leave a Comment