Git -i rebase:未知命令:壁球

时间:2011-08-10 07:43:07

标签: git rebase squash

目前我的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安装有问题?

2 个答案:

答案 0 :(得分:2)

:

之后应该没有squash

答案 1 :(得分:0)

你无法将提交压缩成任何东西。你需要至少两次提交,你可以将一个压缩到另一个。