突然出现:
MacBook-Pro: $ git status
On branch dev
Your branch is up-to-date with 'dropbox/dev'.
You are currently editing a commit while rebasing branch 'Releases' on '72ca998'.
(use "git commit --amend" to amend the current commit)
(use "git rebase --continue" once you are satisfied with your changes)
nothing to commit, working directory clean
分支没有变化。一切都是最新的。
最佳答案
git rebase --abort 应该中止 rebase 操作并返回到之前的状态。但可以肯定的是，你之前输入了什么命令？
编辑:git reflog 的输出可以告诉你 rebase 是从哪里开始的，它看起来像这样
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
关于git - 如何摆脱 "You are currently editing a commit"？，我们在Stack Overflow上找到一个类似的问题： https://stackoverflow.com/questions/31252363/