Git: How to restore a file to a specific branches copy in a 1 liner command

veryangryman · 2020-06-24 14:37:34

So my question best explained by example From master i branch off to branch exampleBranch I change 4 files a,b,c,d but then(after many changes) realise that file d was fine the way it was What is the quickest way to get that file exactly as it was in the master branch while keeping my other 3 changed files

24-06-2020 02:37PM

#1

veryangryman

Registered Users, Registered Users 2 Posts: 5,769 ✭✭✭

Join Date: November 2007

Posts: 4761

So my question best explained by example

From master i branch off to branch exampleBranch

I change 4 files a,b,c,d but then(after many changes) realise that file d was fine the way it was

What is the quickest way to get that file exactly as it was in the master branch while keeping my other 3 changed files

0

Comments

#2 24-06-2020 03:35PM

Mr. CooL ICE

Registered Users, Registered Users 2 Posts: 17,950 ✭✭✭✭

Join Date: July 1999

Posts: 17255

Is this relevant? Just sub in the commit number and file name

0
#3 25-06-2020 11:43AM

Colonel Panic

Registered Users, Registered Users 2 Posts: 2,064 ✭✭✭

Join Date: August 2011

Posts: 2030

git checkout branch -- filename

0
#4 25-06-2020 04:29PM

MyPeopleDrankTheSoup

Registered Users, Registered Users 2 Posts: 2,780 ✭✭✭

Join Date: February 2004

Posts: 2674

git show commit_hash_of_master_commit_you_branched_off -- "file_name_of_file_you_want" | git apply -R

that won't commit, so you can play with it

0