Oh and enable rebase.autostash config option to help with not committing them, so you can still rebase without constantly having to deal with them manually.