The fish shell has added a flag to the abbr command which allows one to expand it only if it is typed after a real command e.g.: git s -> git status s -> s Also see the last example here: https://fishshell.com/docs/current/cmds/abbr.html#examples