Git reset single file in feature branch to be the same as in master

Question

I'm trying to revert my changes in a single file in my feature branch and I want this file to be the same as in master.

I tried:

git checkout -- filename
git checkout filename 
git checkout HEAD -- filename

It seems that none of these made any changes to my feature branch. Any suggestions?

As of 2022, there is a cleaner way to do that: `git restore --source HEAD filename` — Adam, Jun 01 '22 at 23:55
For me I wasn't able to use a git command, it would always say file not found. Instead I went to the main branch in my web browser, downloaded the file and replaced the file on my machine. It works as a UI solution in case git isn't working for whatever reason. — SendETHToThisAddress, Jun 03 '22 at 21:54

score 765 · Accepted Answer · edited Jun 22 '16 at 16:06

765

If you want to revert the file to its state in master:

git checkout origin/master [filename]

edited Jun 22 '16 at 16:06

Milo P

answered Jun 22 '16 at 15:47

Dennan Hogue

1

Thanks Dennan, you are right here. I just found this answer https://stackoverflow.com/questions/13847425/overwrite-single-file-in-my-current-branch-with-the-same-file-in-the-master-bran. I think this is what I was after. – Anton Belev Jun 22 '16 at 15:49
I get this repeating error: "Unlink of file '' failed. Should I try again? (y/n)", then "error: unable to unlink old '': Invalid argument". – Shimmy Weitzhandler Oct 06 '19 at 15:29
2

If you're on windows, keep in mind that git uses CASE SENSITIVE paths. Always screws me up – Kellen Stuart Mar 26 '20 at 21:01

score 79 · Answer 2 · answered Jun 22 '16 at 15:49

79

you are almost there; you just need to give the reference to master; since you want to get the file from the master branch:

git checkout master -- filename

Note that the differences will be cached; so if you want to see the differences you obtained; use

git diff --cached

answered Jun 22 '16 at 15:49

Chris Maes

2 Answers2