You can even use --autostash to avoid the manual stash, and if you're doing this...

		andrewaylett on June 12, 2015 \| parent \| context \| favorite \| on: Show HN: 'git inject' – amend commits other than H... 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.

Nice! wasn't familiar was autostash.