git rebase fork from upstream 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: fetching a forked branch

$ git remote add theirusername [email protected]:theirusername/reponame.git
$ git fetch theirusername
$ git checkout -b mynamefortheirbranch theirusername/theirbranch

Example 3: rebase my fork branch

git checkout master # Make sure you are in master
git remote add author original_repo_that_you_forked_from
    # Note: This is in the format [email protected]:authors_name/repo_name.git
    #       Only needs definition once, future fetches then use it. 
git fetch author
git status # make sure you are in the master branch for the following merge
git merge author/master  # i.e. 'into' your master branch
git checkout your-branch
git rebase master        # Now get those changes into your branch.
git push origin your_branch # You can also use `-f` if necessary and `--all`