How to get rid of "You are currently editing a commit"?

Question

Suddenly appeared:

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

No changed in the branch. Everything is up to date.

Answer 1

git rebase --abort should abort the rebase operation and return to the previous state. But to be sure, what commands did you enter before?

edit: the output of git reflog can show you where the rebase started, it would look something like

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

Answer 2

If you end up in this state but you need to keep changes:

1. Make a backup branch of the current branch: git branch my-backup
2. On the current branch abort the rebase: git rebase --abort
3. Merge changes from the backup branch created in step 1: git merge my-backup

Answer 3

try to use git rebase --quit if git rebase --abort failed.

git rebase --quit completely discards the changes.