Question

与标题相同我键入“git rebase -i [commit_id]”，我得到了这个：

Error detected while processing /Users/My_name/.vimrc:
line    1:
E117: Unknown function: pathogen#infect
E15: Invalid expression: pathogen#infect()
Press ENTER or type command to continue

输入后，我成功进入vim编辑器。

  1 pick f694d12 test
  2
  3 # Rebase 3dad5af..f694d12 onto 3dad5af (1 command(s))
  4 #
  5 # Commands:
  6 # p, pick = use commit
  7 # r, reword = use commit, but edit the commit message
  8 # e, edit = use commit, but stop for amending
  9 # s, squash = use commit, but meld into previous commit
 10 # f, fixup = like "squash", but discard this commit's log message
 11 # x, exec = run command (the rest of the line) using shell
 12 # d, drop = remove commit
 13 #
 14 # These lines can be re-ordered; they are executed from top to bottom.
 15 #
 16 # If you remove a line here THAT COMMIT WILL BE LOST.
 17 #
 18 # However, if you remove everything, the rebase will be aborted.
 19 #
 20 # Note that empty commits are commented out

我删除第1行“选择f694d12测试”并保存，我刚收到报告

Nothing to do

我该如何解决？

Answer 1

如果你在合并/ rebase期间保存一个空文件，Git认为你改变主意并且不想做任何事情。请参阅您提供的rebase todo文件中的倒数第二行：

# However, if you remove everything, the rebase will be aborted.

要解决此问题，您可以保留提交行，但使用drop命令。您的待办事项文件如下所示：

drop f694d12 test

# Rebase 3dad5af..f694d12 onto 3dad5af (1 command(s))
#
# 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
# x, exec = run command (the rest of the line) using shell
# d, drop = remove commit
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out

或者，如果您要删除最后一次提交，则可以执行以下操作：

git reset --hard HEAD^

或者：

git reset --hard 3dad5af

使用git rebase，我得到'无事可做'

1 个答案: