rebase repository forked code example

Example 1: git rebase fork

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

git fetch upstream

git checkout master

git rebase upstream/master

git push -f origin master

Example 2: rebase forked branch with master

# 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

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