Comment Comment by andrewaylett You can even use --autostash to avoid the manual stash, and if you're doing this a lot then the config options rebase.autosquash and rebase.autostash are your friends. parent andrewaylett 11 years ago