Fix bash missing `then`
Improve rebase aliases