<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body text="#000000" bgcolor="#ffffff">
First do "git status" so you get a list of things you might want to
rollback.<br>
(if you got git colors enabled it looks nicer btw, see emmanual's
git blog on in.relation.to)<br>
<br>
Then just do<br>
git checkout -- theFileIWantToRollback.txt<br>
<br>
More info in the the Pro Git book<br>
<a class="moz-txt-link-freetext" href="http://progit.org/book/ch2-8.html">http://progit.org/book/ch2-8.html</a><br>
section Unmodifying a Modified File<br>
<br>
<blockquote type="cite">You should also realize that this is a
dangerous command: any changes you made to that file are gone —
you just copied another file over it. Don’t ever use this command
unless you absolutely know that you don’t want the file. If you
just need to get it out of the way, we’ll go over stashing and
branching in the next chapter; these are generally better ways to
go.</blockquote>
<br>
Also after working with git a week or 2 on the command line, so we
understand git,<br>
we can start looking at the GUI integration (Eclipse EGit,
IntelliJ).<br>
In the GUI you get a revert/rollback dialog where you can chose
which files more easily.<br>
<br>
Op 27-12-10 17:54, Wolfgang Laun schreef:
<blockquote
cite="mid:AANLkTimJ6BJ2eFAvfcLDoGxj6cnGJkawoNv8=HjiN_fk@mail.gmail.com"
type="cite">After some useful and not so useful changes: how can I
revert the doodles to their original state without throwing away
the useful work?<br>
<br>
I've found:<br>
<br>
git checkout -f whatever<br>
<br>
which is supposed to "throw away local changes", but how can I
restrict this? Or do I have to save everything, reset everything,
and copy the goodies back in?<br>
<br>
Any better way?<br>
<br>
-W<br>
<pre wrap="">
<fieldset class="mimeAttachmentHeader"></fieldset>
_______________________________________________
rules-dev mailing list
<a class="moz-txt-link-abbreviated" href="mailto:rules-dev@lists.jboss.org">rules-dev@lists.jboss.org</a>
<a class="moz-txt-link-freetext" href="https://lists.jboss.org/mailman/listinfo/rules-dev">https://lists.jboss.org/mailman/listinfo/rules-dev</a>
</pre>
</blockquote>
<br>
<pre class="moz-signature" cols="72">--
With kind regards,
Geoffrey De Smet</pre>
</body>
</html>