Rebasing in smartgit "git-am is in progress"

git rebase git-rebase smartgit
Ark picture Ark · Jan 15, 2014 · Viewed 38.3k times · Source

I will try to explain the problem that I have. I have used the rebase option via git bash many times. Now I have SmartGit and don’t know why rebase is not correct.

Step 1:

Step 2:

Step 3:

The result is that HEAD detaches.

Answer

Madhan Ayyasamy picture Madhan Ayyasamy · Jan 25, 2015

The same issue i have faced, i will delete the local branch in my machine and recreate it from origin each and every time. But finally i got the solution. I ran the below command

git am --abort solved my problem.

Related questions

Undoing a git rebase

Does anybody know how to easily undo a git rebase? The only way that comes to mind is to go at it manually: git checkout the commit parent to both of the branches then create a temp branch from there …

Read More
How to squash all git commits into one?

How do you squash your entire repository down to the first commit? I can rebase to the first commit, but that would leave me with 2 commits. Is there a way to reference the commit before the first one?

Read More
Git: How to rebase to a specific commit?

I'd like to rebase to a specific commit, not to a HEAD of the other branch: A --- B --- C master \ \-- D topic to A --- B --- C master \ \-- D topic instead of A --- B …

Read More