git pull --rebase origin master is not pulling and rebasing master to your branch. You should

• git checkout master
• git pull --rebase
• git checkout -
• git rebase master