ansaurus

Question

Undoing a git pull --rebase

Answer 1

A:

Use git log -g and find the commit index you want to go back to, the just do git checkout index

Johan Dahlin 2010-02-06 13:34:34

Answer 2

+5 A:

using git reflog you will see a list of commits HEAD pointed to in the past

using

git checkout -b after-commit HEAD@{1} # or the commit you want to recover

you create a new branch at that precise position and check it out

knittl 2010-02-06 13:43:12

doing this throws an error informing me that a file will be overwritten by merge. Is there a way to ignore this?

Thomas 2010-02-06 14:21:06

Make sure your working directory is clean (git reset --hard HEAD will do that). Also, make sure the rebase is no longer in progress (git rebase --abort).

Wayne Conrad 2010-02-06 14:22:47

You my friend are a life saver! Thank you :)

Thomas 2010-02-06 14:46:14

Been there, done that! I think I've made every goof you can make with git. Git is a saw with no guard that makes it easy to cut your own arm off. But it also comes with an easy arm reattachment kit, and you can even attach the arm to your knee if you want.

Wayne Conrad 2010-02-06 14:58:17

@wayne great metaphor :D

knittl 2010-02-06 16:45:36

You can combine the checkout and reset commands and just do `git reset --hard HEAD@{1}`

Pat Notz 2010-02-08 14:07:14

@pat: that will also move the branch, using reset and checkout separately you still have your old branch (which is a little bit safer if you don't know what you'r doing)

knittl 2010-02-08 16:21:20

Answer 3

+2 A:

Actually, to make this easier Git keeps a reference named ORIG_HEAD that points where you were before the rebase. So, it's as easy as:

git reset --hard ORIG_HEAD

Pat Notz 2010-02-08 14:06:26

ansaurus

tags:

views:

answers:

Undoing a git pull --rebase

related questions