How to revert to origin's master branch's version of file

user_68183 0
Viewed 472089

I'm in my local computer's master branch of a cloned master-branch of a repo from a remote server.

I updated a file, and I want to revert back to the original version from the remote master branch.

How can I do this?

git
6 Answers

Can also be done using git restore

git restore --source origin/master filename

user_18599890

For the sake of adding an alternative (not necessarily a better one, of course), if you have already committed the file before, but now you need to undo the change, here's what you can do:

git diff HEAD..master -- path/to/file.ext | git apply -

This generates a diff to restore the file to the version in the master branch, and then applies it. The minus after git apply tells git to read the patch from standard input.

You can then commit the file as usual.

Here is the same command expressed as a shell function:

# Git Reset File
function grf() {
  git diff HEAD..master -- $1 | git apply -
}

# for example: grf ./someChangedFile.txt
user_19731640

you need to find the latest commit id and the directory of the file you want to revert.

then using the following commands

git checkout [commit ID] -- path/to/file
git commit -m 'commit message'

will help you to revert the file you want to latest version of that file on remote computer.

user_133096840

If you didn't commit it to the master branch yet, its easy:

  • get off the master branch (like git checkout -b oops/fluke/dang)
  • commit your changes there (like git add -u; git commit;)
  • go back the master branch (like git checkout master)

Your changes will be saved in branch oops/fluke/dang; master will be as it was.

user_957330
Related