Undo modified files in git does not work

Question

I have modified files in my git repo, but git checkout <file> does not work and neither does git reset --hard. There are no error messages whatsoever. I also have one *.orig and git clean -f does not remove that file either?

Did you do a merge and you failed? Or, are you in the middle of a merge? — Atropo
– Atropo, Commented Aug 7, 2013 at 9:30
@Atropo maybe I have merged and not committed because the files seems to be staged. But I thought I could reset staged files using git reset HEAD <file>? — marcus
– marcus, Commented Aug 7, 2013 at 9:34
git status -s M README.md M src/NKA.Core/Domain/PageTypes/AreaPage.cs.orig M src/NKA.Web/App_Browsers/AdapterMappings.browser M src/NKA.Web/App_Browsers/IE6.browser M src/NKA.Web/Templates/ArticleList.aspx M src/NKA.Web/Templates/Page.aspx — marcus
– marcus, Commented Aug 7, 2013 at 9:39
Do you want to reverty the changes? Try these : git checkout -- <filename> or git reset --hard origin/master or git reset --hard origin/[branch-name] — Arpit
– Arpit, Commented Aug 7, 2013 at 9:54

RazerM · Accepted Answer · 2013-08-07 09:09:59Z

2

If git checkout and git reset --hard are leaving files in a modified state, it can be caused by git modifying line-endings or whitespace.

Run git diff --ignore-space-change to see if there are non-whitespace changes.

If the *.orig file is not tracked by git, but is ignored, you must add the -x parameter so that git doesn't use the standard ignore rules.

git clean -f -x

answered Aug 7, 2013 at 9:09

RazerM

5,5522 gold badges27 silver badges36 bronze badges

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

4 Comments

RazerM Over a year ago

git clean only removes untracked files, but git status shows that the file is tracked. The modified status is definitely whitespace, see Dealing with line endings.

marcus Over a year ago

Ok, how can I reset modified tracked files from my local repo?

marcus Over a year ago

you are correct, I use both os x and windows in this repo so I emailed github and they told me to put *text=auto in my .gitattributesfile but if I remove that line again my changed are gone. Maybe this is off topic but what is the best settings for line endings when working on both os x and windows?

RazerM Over a year ago

GitHub recommends git config --global core.autocrlf input on OS X and git config --global core.autocrlf true on Windows.

Sachin Singh · Accepted Answer · 2013-08-07 09:14:01Z

0

try this out.

i think the file is in staged section.

first do

   git reset HEAD <file>...

then do

  git checkout <file>...

answered Aug 7, 2013 at 9:14

Sachin Singh

7,2976 gold badges46 silver badges87 bronze badges

Comments

Atropo · Accepted Answer · 2013-08-07 09:50:14Z

0

To me looks like you're in the middle of a merge, that's why you have the .orig files. Diff tools create .orig files to keep a backup of merged files.

If you want to abort the merge you can do, but only if you have git >= 1.6.1

git reset --merge

Or, starting from version 1..7.4, you do:

git merge --abort

answered Aug 7, 2013 at 9:50

Atropo

12.6k8 gold badges51 silver badges62 bronze badges

Collectives™ on Stack Overflow

Undo modified files in git does not work

3 Answers 3

4 Comments

Comments

Comments

Your Answer

Hot Network Questions

Collectives™ on Stack Overflow

3 Answers 3

4 Comments

Comments

Comments

Your Answer

Sign up or log in

Post as a guest

Related