git - Git -i rebase：未知命令：壁球

Question

目前我的 git-rebase-todo 是

squash: f732993 aaatest

# Rebase f3a7aa7..f732993 onto f3a7aa7
#
# Commands:
# p, pick = use commit
# r, reword = use commit, but edit the commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like "squash", but discard this commit's log message
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#

和命令行输出

eugene@eugene-desktop:~/git$ git rebase --continue
Unknown command: fixup: f732993 aaatest
Please fix this in the file /home/eugene/git/.git/rebase-merge/git-rebase-todo.

为什么它不能识别壁球，我的 git 安装有问题吗？

Answer 1

:后面应该没有squash

Answer 2

您不能将提交压缩为空。您至少需要两次提交，您可以在其中将一个压缩到另一个。