more aliases for merge/rebase