How to rebase local branch with remote master

git clone git-rebase
Damir picture Damir · Oct 28, 2011 · Viewed 909.5k times · Source

I have a cloned project from a master branch from remote repository remote_repo. I create a new branch and I commit to that branch. Other programmers pushed to remote_repo to the master branch.

I need now to rebase my branch RB onto remote_repo master.

How to do this? What commands to type to a terminal?

Answer

Frerich Raabe picture Frerich Raabe · Oct 28, 2011

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.

Related questions

"fatal: Not a git repository (or any of the parent directories)" from git status

This command works to get the files and compile them: git clone a-valid-git-url for example: git clone git://cfdem.git.sourceforge.net/gitroot/cfdem/liggghts However, git status (or any other git command) then gives the above fatal: Not a …

Read More
What is the difference between pull and clone in git?

What is the difference between doing (after mkdir repo and cd repo): git init git remote add origin git://github.com/cmcculloh/repo.git git fetch --all git pull origin master and git clone git://github.com/cmcculloh/repo.git …

Read More
git: fatal: I don't handle protocol '​​http'

I copy and pasted an git clone command from a web page: https://fedorahosted.org/ibus-typing-booster/ I got this: user@host> git clone ​​http://git.fedorahosted.org/git/ibus-typing-booster.git Cloning into 'ibus-typing-booster'... fatal: I don't handle protocol '​​…

Read More