Make 'abort' alias work with either git rebase or cherry-pick