How-to revert a locally modified file

How-to revert a locally modified file

[Wink Saville]

Hello,

I searched the net and couldn't find the answer to how to revert a
file to its "pre-modified" state.

I did see in the 0.99.7 To Do:

* Perhaps a tool to revert a single file to pre-modification
state? git-cat-file blob `git-ls-files | grep foo` >foo or
git-cat-file blob `git-ls-tree HEAD foo` >foo? What should
the command be called? git-revert is taken so is
git-checkout.

Did such a command come to be?

Thanks,

Re: How-to revert a locally modified file

[Junio C Hamano]

Wink Saville <wink@saville.com> writes:

> Hello,
>
> I searched the net and couldn't find the answer to how to revert a
> file to its "pre-modified" state.
>
> I did see in the 0.99.7 To Do:

Where did you find 0.99.7 ToDo?  I am curious...

> * Perhaps a tool to revert a single file to pre-modification
> state? git-cat-file blob `git-ls-files | grep foo` >foo or
> git-cat-file blob `git-ls-tree HEAD foo` >foo? What should
> the command be called? git-revert is taken so is
> git-checkout.
>
> Did such a command come to be?

commit 4aaa702794447d9b281dd22fe532fd61e02434e1
Author: Junio C Hamano <junkio@cox.net>
Date:   Tue Oct 18 01:29:27 2005 -0700

    git-checkout: revert specific paths to either index or a given tree-ish.
    
    When extra paths arguments are given, git-checkout reverts only those
    paths to either the version recorded in the index or the version
    recorded in the given tree-ish.
    
    This has been on the TODO list for quite a while.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>

See the EXAMPLES section of git-checkout manual page.

Re: How-to revert a locally modified file

[Wink Saville]

Junio C Hamano wrote:
> Wink Saville <wink@saville.com> writes:
> 
> 
> Where did you find 0.99.7 ToDo?  I am curious...

here: http://kerneltrap.org/node/5678

> 
>     git-checkout: revert specific paths to either index or a given tree-ish.
>     
>     When extra paths arguments are given, git-checkout reverts only those
>     paths to either the version recorded in the index or the version
>     recorded in the given tree-ish.
>     

FYI the above seems more obvious then what's in the man page:

"It updates the named paths in the working tree from the
index file (i.e. it runs git-checkout-index -f -u)."

But for me saying something like;

"It reverts the paths in the working tree to the most recent version stored in git."

would even be better. It may not be as precise as the current sentence,
but more obvious to this neophyte. Finally, in the EXAMPLES you
might add another example of reverting a "modified the file" as
well as recovering a deleted file.

In any case thanks,