Git rebase from remote fork repo

git_rebase.md

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.

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"?

Thanks

Very useful, thank you!!!

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

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

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 ;)

Thanks dude i was looking for this

Thanks!

Thanks. I needed to do exactly this!

Thanks a lot. Very clear.

Very clear post, thank you.
This should be in the github docs!

Thanks for sharing :)

How can I choose an specific brach on remote repository to rebase my fork?

@andreRozario

git checkout local/branch
git rebase remore/branch

I squash my commits into one using git rebase -i HEAD~<some number> and I see the desired changes in git log but I cant push the changes instead it asks me to do a pull and when i do that my squashed commits are either gone or the squashed commit is added as a new commit , adding one more commit which includes all the commits I squahsed. I'm trying to figure this out

You might need to do a git fetch --all after git remote add upstream https://...

Thanks for sharing : )