How to undo git pull from unrelated project?

Question

I just did something dumb. In my fooclient project, I just did:

git remote add official https://github.com/fooserver
git pull official master

In other words, I pulled a completely different codebase (the server, instead of the client) into my working directory. Not surprisingly, there weren't many merge conflicts (the file names are all completely different, after all). Also not surprisingly, Git completely failed to warn me that the repos didn't have a single common ancestor.

In this particular situation, I'm able to recover by doing this:

cp file-i-worked-on.js ~
git reset --hard HEAD # to discard broken merge conflicts
git checkout a12345 # where a12345 is the latest head of fooclient that I had checked out
cp ~/file-i-worked-on.js .

But what would be the more general strategy?

Andrew Marshall · Accepted Answer · 2012-03-12 01:13:39Z

4

This will reset you to the last state master was in:

git reset --hard HEAD@{1}

This is possible because of the reflog. Running git reflog will show you the reflog, and allow you to verify you're resetting to the correct state.

answered Mar 12, 2012 at 1:13

Andrew Marshall

97.3k20 gold badges228 silver badges217 bronze badges

Sign up to request clarification or add additional context in comments.

2 Comments

Steve Bennett Over a year ago

Ah - this sounds like the right answer. So HEAD@{...} lets you track changes to what is pointed to by HEAD. And hence, your command translates to "You know what HEAD pointed to just before we messed things up? Let's go back there..." - sounds like a pretty useful tool.

Andrew Marshall Over a year ago

@SteveBennett Yup! It's very useful because it makes it far easier to undo an accidental command than trying to backtrace what you did. Sadly it's not a very well known feature of Git.

John Feminella · Accepted Answer · 2012-03-12 01:12:53Z

0

After removing the unwanted remote (git remote rm ...), just git reset --hard to the spot you want your current branch to be on.

git reset --hard origin/master

If you were on master before, this resets your master to be the same spot that your origin remote's master is it. That's it!

answered Mar 12, 2012 at 1:12

John Feminella

313k49 gold badges348 silver badges362 bronze badges

1 Comment

Andrew Marshall Over a year ago

Just want to note that this assumes you don't have any unpushed local commits.

wintersolutions · Accepted Answer · 2012-03-12 01:12:56Z

0

git stash
git reset --hard HEAD^
git stash apply

answered Mar 12, 2012 at 1:12

wintersolutions

5,3415 gold badges32 silver badges51 bronze badges

2 Comments

Steve Bennett Over a year ago

Wouldn't git stash also stash the half-merged files?

wintersolutions Over a year ago

@SteveBennett: Yeah youre right, i didn't read the part about merge conflicts still beeing there.

Adam Dymitruk · Accepted Answer · 2012-03-12 01:19:33Z

0

From now on

git fetch

Inspect what you got in gitk or git log or anything else. Now merge or rebase what you got to where you want it to go.

answered Mar 12, 2012 at 1:19

Adam Dymitruk

131k28 gold badges149 silver badges143 bronze badges

2 Comments

Steve Bennett Over a year ago

Are you saying you never use git pull?

Adam Dymitruk Over a year ago

Correct. I used to. I don't anymore.

Collectives™ on Stack Overflow

How to undo git pull from unrelated project?

4 Answers 4

2 Comments

1 Comment

2 Comments

2 Comments

Your Answer

Hot Network Questions

Collectives™ on Stack Overflow

4 Answers 4

2 Comments

1 Comment

2 Comments

2 Comments

Your Answer

Sign up or log in

Post as a guest

Related