git branch my-temporary-work
git checkout master
git merge my-temporary-work