~ make rebase default
+ add shortcut for cherry-picking