2011-08-10 17 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

不能壓扁提交到什麼。您至少需要兩次提交,您可以將一個壓縮到另一個壓縮。