threads / discuss / 13306

Simple problem

Subject: Simple problem

## tl;dr

5 messages between Apr 28, 2008 and Apr 28, 2008.

replies: 4people: 4as markdown or json

Kenneth P. Turvey· Apr 28, 2008, 16:31 UTC · lore

I ran into an issue earlier today that I didn't know how to easily solve in git. I'm sure it is easy to handle, but I wasn't sure how.

I removed a file and then realized I'd hit the wrong one. So all I wanted to do was to get the file back the way it was in the last commit.

Basically I wanted something similar to:

svn update myfile

in subversion.

I got it back by using a diff and just deleting all the minus signs at the beginning of the lines, but I'm sure this isn't the way to handle this. Strangely this simple case wasn't covered by any of the tutorials I looked at.

Thanks.

-- 
Kenneth P. Turvey <kt-usenet@squeakydolphin.com>

Bill Lear· Apr 28, 2008, 16:35 UTC · re: Kenneth P. Turvey · lore

Re: Simple problem

On Monday, April 28, 2008 at 16:31:05 (+0000) Kenneth P. Turvey writes:

Show 16 quoted lines

>I ran into an issue earlier today that I didn't know how to easily solve 
>in git.  I'm sure it is easy to handle, but I wasn't sure how.  
>
>I removed a file and then realized I'd hit the wrong one.  So all I 
>wanted to do was to get the file back the way it was in the last commit.  
>
>Basically I wanted something similar to:
>
>svn update myfile
>
>in subversion.  
>
>I got it back by using a diff and just deleting all the minus signs at 
>the beginning of the lines, but I'm sure this isn't the way to handle 
>this.  Strangely this simple case wasn't covered by any of the tutorials 
>I looked at.

% rm file [oops] % git checkout file

Bill

Björn Steinbrink· Apr 28, 2008, 16:49 UTC · re: Bill Lear · lore

Re: Simple problem

On 2008.04.28 11:35:55 -0500, Bill Lear wrote:

Show 21 quoted lines

> On Monday, April 28, 2008 at 16:31:05 (+0000) Kenneth P. Turvey writes:
> >I ran into an issue earlier today that I didn't know how to easily solve 
> >in git.  I'm sure it is easy to handle, but I wasn't sure how.  
> >
> >I removed a file and then realized I'd hit the wrong one.  So all I 
> >wanted to do was to get the file back the way it was in the last commit.  
> >
> >Basically I wanted something similar to:
> >
> >svn update myfile
> >
> >in subversion.  
> >
> >I got it back by using a diff and just deleting all the minus signs at 
> >the beginning of the lines, but I'm sure this isn't the way to handle 
> >this.  Strangely this simple case wasn't covered by any of the tutorials 
> >I looked at. 
> 
> % rm file
> [oops]
> % git checkout file

That restores the version from the index, so it will fail if you did "git rm file". To get the file from HEAD use "git checkout HEAD -- file".

Björn

Kenneth P. Turvey· Apr 28, 2008, 18:58 UTC · re: Björn Steinbrink · lore

Re: Simple problem

On Mon, 28 Apr 2008 18:49:45 +0200, Björn Steinbrink wrote:

[Snip]

> That restores the version from the index, so it will fail if you did
> "git rm file". To get the file from HEAD use "git checkout HEAD --
> file".

Thanks. I tested this and it works as advertised. I took a look at the man page and I understand what the -- is for too.

I had actually tried:

git checkout myfile.java

and this didn't work.

-- 
Kenneth P. Turvey <kt-usenet@squeakydolphin.com>

Alex Riesen· Apr 28, 2008, 17:47 UTC · re: Kenneth P. Turvey · lore

Re: Simple problem

Kenneth P. Turvey, Mon, Apr 28, 2008 18:31:05 +0200:

Show 10 quoted lines

> I ran into an issue earlier today that I didn't know how to easily solve 
> in git.  I'm sure it is easy to handle, but I wasn't sure how.  
> 
> I removed a file and then realized I'd hit the wrong one.  So all I 
> wanted to do was to get the file back the way it was in the last commit.  
> 
> Basically I wanted something similar to:
> 
> svn update myfile
>

git checkout HEAD filename

but mostly just "git checkout filename"