how to discard git local branch changes?

Question

how to discard git local branch changes? eg, local branch with version: A->B->C Now I am on version A, and it has some changes conflict with latest version C. I want to discard local changes and pull the latest version C.

$ git pull

I will meet some error. and there are many files, so I don't need to do many times $ git co files

Is there any better way?

score 82 · Accepted Answer · answered Oct 21 '11 at 08:19

82

If you have uncommitted changes that you want to discard, use this:

$ git reset --hard

which is equivalent to

$ git reset --hard HEAD

This removes all the local uncommitted changes. If you want to remove some offending commits from your local branch, try rewinding it:

$ git reset --hard HEAD^ #moves HEAD back by one commit

or e.g.

$ git reset --hard HEAD~3 #moves HEAD back by 3 commits

Use these with caution, as you won't be able to undo these operations. Once you're done cleaning up your local branch, use git pull to get the latest code.

answered Oct 21 '11 at 08:19

ayoy

3,835
19
20

If you have already pushed your branch to a remote server you need to be careful with reset --hard as it can mess up the history. – Joshua Dance Jul 21 '14 at 16:56
1

That doesn't delete the uncommitted files. You would have to delete these files manually. – IgorGanapolsky Jan 15 '16 at 16:36

score 37 · Answer 2 · answered Dec 10 '11 at 15:46

37

git fetch
git reset --hard origin/master

answered Dec 10 '11 at 15:46

Onlyjob

5,692
2
35
35

`git reset --hard origin/master` is exactly what I was looking for! – mystarrocks Jul 27 '16 at 13:47
this is assuming you ave checked in to the remote at some point, does the same apply to local repos? can i do `git reset --hard otherLocalBranch` for the same effect? – Matt Catellier Sep 24 '16 at 20:03
This is exactly what I was looking for to discard commits I pulled from another branch by mistake. Thanks @Onlyjob – Bharat Dodeja Nov 13 '17 at 12:50

score 1 · Answer 3 · answered Oct 21 '11 at 08:23

1

Have you already commited your local changes? If not a git reset --hard HEAD should do the trick

answered Oct 21 '11 at 08:23

daja77

11
1

2

You can also undo locally committed changes, see ayoy's solution. – jli Oct 21 '11 at 17:14

how to discard git local branch changes?

3 Answers3

Linked