Alias m and r to merge and rebase