Stash, pull, stash pop, commit, push :D