目前,我的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安装有问题?
发布于 2011-08-10 15:48:08
在squash之后不应该有:
发布于 2011-08-10 16:00:09
您不能将提交压缩为空。你至少需要两次提交,这样你就可以把一个压缩到另一个中。
https://stackoverflow.com/questions/7007406
复制相似问题