The scenario:
I make some changes in a single file locally and run git add, git commit and git push The file is pushed to the remote origin master repository I have another local repository that is deployed via Capistrano with the "remote_cache" method from that remote repository 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 restore -s origin/master -- path/to/file
. See my answer below.
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.
Following code worked for me:
git fetch
git checkout <branch from which file needs to be fetched> <filepath>
git fetch <remote>; git checkout <remote>/<branch> -- <file>
for non-origin remotes
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
git restore -s upstream/master -- path/to/file
restore
is better from my testing, because it puts files in the working area instead of the staging area as checkout
does.
git archive --format=zip --remote=ssh://<user>@<host>/repos/<repo name> <tag or HEAD> <filename> > <output file name>.zip
git archive --remote=https://github.com/git/git.git master:git/contrib/completion git-completion.bash | tar -x
Gives me error message: fatal: Operation not supported by protocol.
tar
:s --to-stdout
, git archive --remote="gitolite3@<host>:<repo>" <tag> <file> | tar xf - --to-stdout
Simply It works for me
git checkout origin/develop file_name.php
What you can do is:
Update your local git repo: git fetch Build a local branch and checkout on it: git branch pouet && git checkout pouet Apply the commit you want on this branch: git cherry-pick abcdefabcdef (abcdefabcdef is the sha1 of the commit you want to apply)
git checkout -b pouet
.
Or git stash (if you have changes) on the branch you're on, checkout master, pull for the latest changes, grab that file to your desktop (or the entire app). Checkout the branch you were on. Git stash apply back to the state you were at, then fix the changes manually or drag it replacing the file.
This way is not sooooo cool but it def works if you guys can't figure anything else out.
我的英文很烂,我给你列出步骤: (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.
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
Success story sharing
git checkout origin/master -- path/to/folder/*
(note the * in the end).