sync fork with upstream

reset_master

git fetch --all

# reset master to upstream/master
git checkout master
git reset --hard upstream/master
git push --force

# replay the patches (even they are rejected for now) on top of master
git checkout mybranch
git rebase master
git push -u origin mybranch

# from https://stackoverflow.com/questions/29049650/github-fork-your-branch-is-5-commits-ahead-how-to-clean-this-without-pushing