cherry-pick: allow "-" as abbreviation of '@{-1}'