Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
Git rebase from remote fork repo

In your local clone of your forked repository, you can add the original GitHub repository as a "remote". ("Remotes" are like nicknames for the URLs of repositories - origin is one, for example.) Then you can fetch all the branches from that upstream repository, and rebase your work to continue working on the upstream version. In terms of commands that might look like:

Add the remote, call it "upstream":

git remote add upstream https://github.com/whoever/whatever.git

Fetch all the branches of that remote into remote-tracking branches, such as upstream/master:

git fetch upstream

Make sure that you're on your master branch:

git checkout master

Rewrite your master branch so that any commits of yours that aren't already in upstream/master are replayed on top of that other branch:

git rebase upstream/master

If you don't want to rewrite the history of your master branch, (for example because other people may have cloned it) then you should replace the last command with git merge upstream/master. However, for making further pull requests that are as clean as possible, it's probably better to rebase.

If you've rebased your branch onto upstream/master you may need to force the push in order to push it to your own forked repository on GitHub. You'd do that with:

git push -f origin master

You only need to use the -f the first time after you've rebased.

@zorrohahaha

This comment has been minimized.

Copy link

zorrohahaha commented Mar 22, 2019

Very useful information. I have one question, after the last command, in the log I can see
Merge branch 'xxxx' of github.com:xxxx int…
Could I remove this "commit log"?

@giena

This comment has been minimized.

Copy link

giena commented May 2, 2019

Thanks

@ingwarr

This comment has been minimized.

Copy link

ingwarr commented May 21, 2019

Very useful, thank you!!!

@nhannv

This comment has been minimized.

Copy link

nhannv commented Jul 11, 2019

Very useful, I have a question, can I cutoff the history after rebased? Each time I do git rebase upstream/master, it run from the first my own commit, then a lot of conflicts happen, I must run git rebase --skip until meet the new commit from upstream
Thanks

@ravibhure

This comment has been minimized.

Copy link
Owner Author

ravibhure commented Jul 11, 2019

There are many approach, you can choose the best suite to you - https://stackoverflow.com/questions/7744049/git-how-to-rebase-to-a-specific-commit

@ravibhure

This comment has been minimized.

Copy link
Owner Author

ravibhure commented Jul 11, 2019

Very useful information. I have one question, after the last command, in the log I can see
Merge branch 'xxxx' of github.com:xxxx int…
Could I remove this "commit log"?

I will use git commit --amend ;)

@facoco

This comment has been minimized.

Copy link

facoco commented Aug 15, 2019

Thanks dude i was looking for this

@sushiljain1989

This comment has been minimized.

Copy link

sushiljain1989 commented Jun 10, 2020

Thanks!

@gihanmarasingha

This comment has been minimized.

Copy link

gihanmarasingha commented Jul 24, 2020

Thanks. I needed to do exactly this!

@xenolinux

This comment has been minimized.

Copy link

xenolinux commented Jul 27, 2020

This is indeed useful!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.