The caveat to this alternative approach is that no other operations should have been done after the un-wanted rebase that may change the ORIG_HEAD viz. The ORIG_HEAD is created by commands that drastically move your HEAD to record the position of the HEAD before their operation so that you can easily change the tip of the branch back to the state before you run them. SmartGit packages the Git interactive rebase functionality git rebase To change the commit message select the commit and invoke Edit Commit Message. $ git reset -hardĪfter executing the above command, the branch feaure1 is now in a state just before the rebase.Īlternatively, one can also undo a rebase using git reset as follows. We can use git reset to reset the branch to this commit as follows. We can see that was the commit just before the rebase operation. We will now run the git reflog command on the branch feature1 (one on which rebase was done) $ git reflogĪdf3d3d checkout: moving from main to feature1 Using git reflog, we can determine the branch’s head commit immediately before the rebase starts. To undo the rebase, we can use the reflog command of Git. We have done a rebase of the new branch feature1 based on those new commits.

Let’s say we have a main branch, and we have created a new branch feature1 on top of it.Īnd let’s say some commits have happened in the main branch. Using git reflog and git reset to Undo a rebase Done on a Branch in Git We will now illustrate this with an example.

Thus, to achieve this, we now need to undo the rebase operation done on the branch. We want the feature branch to be based on the commits when we first branched it from the main branch. We no longer want to base the new feature branch on the new commits in the main branch. In SmartGit, a distinction is made between Rebase HEAD to and Rebase to HEAD: Rebase HEAD to rebases ('moves') the commits below the HEAD to the selected commit. Then, the main branch has some new commits we may want to rebase the feature branch based on those new ones. Suppose we have a feature branch based on the main branch. Rebasing is the operation of moving the base of a branch to a newer base. This tutorial will talk about undoing a rebase done on a branch in Git.

Rebase head to smartgit