git: checkout files from another branch into current branch (don't switch HEAD to the other branch)

Question

I want to load a different version of the files that exist in another branch into my current branch.

git help checkout says:

DESCRIPTION Updates files in the working tree to match the version in the index or the specified tree. If no paths are given, git checkout will also update HEAD to set the specified branch as the current branch.

Is there a way to checkout all those files, but not update HEAD?

@BobbyA I don't think so. 1: the question and answer are about something else (branch & file/folder name collisions). 2: this question is older. — Kache
– Kache, Commented Jun 12, 2018 at 18:02
I flagged the wrong question (multiple tabs), realized it immediately, and retracted the flag. I didn't realize there was a comment though. I got caught! Apologies :) Deleting that comment now since it's misleading — BobbyA
– BobbyA, Commented Jun 12, 2018 at 22:04

Kache · Accepted Answer · 2017-07-18 23:31:15Z

106

checkout by providing the current path, .:

git checkout other-branch-name -- .

This operation is similar to switching HEAD to another branch without checking out files, but just from the "other direction".

As @김민준 mentions, this overwrites any uncommitted changes. Remember to either stash or commit them somewhere first if needed.

edited Jul 18, 2017 at 23:31

answered Mar 20, 2013 at 23:20

Kache

17k13 gold badges59 silver badges87 bronze badges

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

5 Comments

김민준 Over a year ago

Just a heads up, this will discard all your uncommited work. Obvious in hindsight, but got bitten hard :'(

Laurent Caillette Over a year ago

This is the easiest way to perform a merge from a feature branch from which you don't want to keep all the details. The -- . was a bit hard to find, thanks!

red888 Over a year ago

can you explain what -- . is actually doing? "." is here and -- with no argument mean "all" ?

Kache Over a year ago

As far as I know, Git uses -- as a separator between the commands to the left and the file globs to the right.

rythos42 Over a year ago

This didn't work exactly for me, using Windows (maybe other differences?) I had to use git checkout <other-branch-name> -- C:\path\to\changes\*

zypA13510 · Accepted Answer · 2021-06-08 06:05:55Z

Similar to @Kache's answer, but using the newer git restore command (requires Git version 2.23 or above):

git restore --source=<other-branch/tag/commit> <pathspec> # or git restore -s <other-branch/tag/commit> <pathspec> # example: to load all files from branch "other" git restore -s other .

This new command was introduced to split "checking out a branch" and "checking out files" out of the single git checkout command. Read more: What is the git restore command.

I would suggest adding the --overlay option to this command, otherwise you risk loosing everything that is not committed

Collectives™ on Stack Overflow

git: checkout files from another branch into current branch (don't switch HEAD to the other branch)

2 Answers 2

5 Comments

1 Comment

Linked

Hot Network Questions

Collectives™ on Stack Overflow

2 Answers 2

5 Comments

1 Comment

Linked

Related