Git: How to update/checkout a single file from remote origin master?

user_337109 0
Viewed 736786

The scenario:

  1. I make some changes in a single file locally and run git add, git commit and git push
  2. The file is pushed to the remote origin master repository
  3. I have another local repository that is deployed via Capistrano with the "remote_cache" method from that remote repository
  4. Now I don't want to deploy the whole application but just update/checkout that single file.

Is this somehow possible with git? I wasn't able to find anything that would work nor was I able to figure it out. With SVN I just did svn up file and voila.

git-checkout git
9 Answers

It is possible to do (in the deployed repository)

git fetch
git checkout origin/master -- path/to/file

The fetch will download all the recent changes, but it will not put it in your current checked out code (working area).

The checkout will update the working tree with the particular file from the downloaded changes (origin/master).

At least this works for me for those little small typo fixes, where it feels weird to create a branch etc just to change one word in a file.

user_4183450

Following code worked for me:

git fetch
git checkout <branch from which file needs to be fetched> <filepath>
user_61360010

With Git 2.23 (August 2019) and the new (still experimental) command git restore, seen in "How to reset all files from working directory but not from staging area?", that would be:

git fetch
git restore -s origin/master -- path/to/file

The idea is: git restore only deals with files, not files and branches as git checkout does.
See "Confused by git checkout": that is where git switch comes in)

codersam adds in the comments:

in my case I wanted to get the data from my upstream (from which I forked).
So just changed to:

git restore -s upstream/master -- path/to/file
VonC_63090

Simply It works for me

git checkout origin/develop file_name.php
user_29789280

我的英文很烂，我给你列出步骤： (My English is terrible. I'll lay out the steps for you):

git checkout master
git pull --rebase
git checkout dev
git checkout master ./app/file.py

Machine translation: If you are developing in the dev branch, merge the master branch after replacing the file and push it. For example, replace app/file.py.

user_181374880

I think I have found an easy hack out.

Delete the file that you have on the local repository (the file that you want updated from the latest commit in the remote server)

And then do a git pull

Because the file is deleted, there will be no conflict

user_86671110
Related