2011-08-10 20 views
2

在当前点我混帐重订,待办事项是Git的变基-i:未知命令:壁球

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. 
# 

和命令行输出

[email protected]:~/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

应该没有:squash

+0

ops,我的错。谢谢! – Eugene

0

不能压扁提交到什么。您至少需要两次提交,您可以将一个压缩到另一个压缩。