git: I got "am/rebase" in my prompt, what to do?

Question

I don't know what I have "touch" but now I have in my prompt this:

(master|AM/REBASE)

what should I do?

Answer 1

What you "touched" is the git am command.

Use the following to exit the am mode.

git am --abort

Do not use git rebase --abort since you will lose all your local changes that are not stashed. It's easy to forget what git rebase --abort really does and lose local changes when you did not intend to get into a rebase state. (I did)