Merge remote-tracking branch 'refs/remotes/origin/main'

Author: paulirish

Diff for: fish/aliases.fish

@@ -68,7 +68,6 @@ subcommand_abbr git c "commit -am"
 subcommand_abbr git tc "commit -am"
 subcommand_abbr git cm "commit --no-all -m"
 subcommand_abbr git co "checkout"
-subcommand_abbr git c "commit -am"
 subcommand_abbr git s "status"
 subcommand_abbr git ts "status"
 subcommand_abbr git amend "commit --amend --all --no-edit"