git -如何摆脱You are currently editing a commit while rebasing branch

git - 如何摆脱 “You are currently editing a commit”？ | commit

MacBook-Pro: $ git status
On branch dev
Your branch is up to date with 'origin/dev'.
You are currently editing a commit while rebasing branch 'dev' on '29fbbb43'.
  (use "git commit --amend" to amend the current commit)
  (use "git rebase --continue" once you are satisfied with your changes)

nothing to commit, working tree clean

分支中没有更改。一切都是最新的。

最佳答案

git rebase --abort应该终止变基操作并返回到先前的状态。

但是可以肯定的是，您之前输入了哪些命令？

编辑:git reflog的输出可以显示重新设置的开始位置，看起来像

<span style="background-color:#fefefe"><span style="color:#222222"><code>7d0b010 HEAD@{0}: rebase finished: returning to refs/heads/bran
7d0b010 HEAD@{1}: rebase: adding file in branch
a7e6693 HEAD@{2}: rebase: checkout master
a7e6693 HEAD@{3}: commit: adding file in master
4c00dd7 HEAD@{4}: checkout: moving from bran to master
3cb192a HEAD@{5}: commit: adding file in branch</code></span></span>