git fetch origin

git rebase origin/master

# if you get an error about uncommitted local changes then stash them
git stash

git push origin HEAD:refs/for/master

#if you stashed changes then bring them back
git stash apply