Simple problem

Simple problem

[Kenneth P. Turvey]

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>

Re: Simple problem

[Bill Lear]

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


Bill

Re: Simple problem

[Björn Steinbrink]

On 2008.04.28 11:35:55 -0500, Bill Lear wrote:
> 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

Re: Simple problem

[Kenneth P. Turvey]

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>

Re: Simple problem

[Alex Riesen]

Kenneth P. Turvey, Mon, Apr 28, 2008 18:31:05 +0200:
> 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"