Cancel git reboot using

Question

I reinstalled my version2 branch against the wizard using:

 git rebase --onto master version1 version2 

How can i undo this?

To undo this, I did git reflog

Currently, git status (on version2 ) gives me:

 Your branch and 'origin/version2' have diverged, and have 2563 and 222 different commits each, respectively. nothing to commit (working directory clean) 

I want to cancel this reboot.

Answer 1

Assuming you haven't changed the version2 branch since you rebuilt it, all you have to do is hard reset the branch to its first previous position using the syntax <reference>@{n} , where n Nth preceding position of the link :

 git checkout version2 git reset --hard version2@ {1} 

Answer 2

A very quick and easy way to undo git rebase is to return branch labels.

If you are sure you want to discard the current tip of the version2 branch, you can start with git reflog (just like you). I will also include the rebase step rebase , and I will leave some “real” shortened links:

 $ git checkout branch $ git rebase --onto master start-after branch ... rebase output ... # oops! dag-nab-it! didn't mean to do that! $ git reflog <rev..> HEAD@ {0}: rebase finished: returning to refs/heads/branch <rev..> HEAD@ {1}: rebase: some commit msg... 05f7dc8 HEAD@ {2}: rebase: checkout master aa4e140 HEAD@ {3}: checkout: moving from master to branch 

Here aa4e140 is where the HEAD branches are. This is also available in ORIG_HEAD :

 $ git log -1 --oneline ORIG_HEAD aa4e140 some commit msg... 

(Use more logs if you need to make sure you go to the right place.)

If you have done some other git things since recovery, ORIG_HEAD may have moved, but reflog will have the correct value. If ORIG_HEAD and what you see in the reflog agree, you definitely have the correct value. In any case, make sure that you have the correct value (and that you have no saved changes, that git status clean - you can use git stash , if necessary, here).

Also try git reflog version2 , which will show you the history of the version2 label.

Now just run the current branch - make sure that the one you want to change is still on the target commit:

 $ git branch ... see that you're still on "branch" or "version2" or whatever $ git reset --hard aa4e140 

Voila, everything went back to how they were before you started git rebase .

If you haven’t done anything to change ORIG_HEAD , this is even easier than all of this:

 $ git log ORIG_HEAD # make sure that what you want ... $ git branch # make sure you're on `version2` ... $ git reset --hard ORIG_HEAD HEAD is now at ... 

but the reflog method reflog more general (it works about a month ¹ after rebase, regardless of what you did between them). A.

( ¹ The time period here is configurable, see git reflog . The default is 30 days for reflog entries "not accessible from the current branch tip", which is usually the case for old commits before reinstalling.)

---

The key to understanding why this works is simple: git rebase stores your old commits. It simply adds new commits to commit-graph, and then moves the label. When the shortcut has moved, it is harder to see your old commits - they are not displayed by default, they are only in the "reflog", but they are still there. Return the label, and the new commits are those that are not displayed, and the old ones are back!