On Mon, Feb 7, 2011 at 12:48 PM, Aristotle Pagaltzis <[email protected]> wrote:
* Philippe Bruhat (BooK) <[email protected]> [2011-02-07 09:50]:
> You probably want this instead:
>
> git stash
> git reset --hard HEAD^
> git stash pop
>
> THIS is a git undo button.
--mixed
Resets the index but not the working tree (i.e., the
changed files are preserved but not marked for commit)
and reports what has not been updated. This is the
default action.
Yeah, but I *don't* want all changed files preserved. I want only
the changes preserved that were made *on top* of the commit, but
not any changes that came from the commit itself.
Err... that's what it does. Stash saves a changeset, not whole files.
You roll back to HEAD^ and then reapply the changes.
Regards,
--
Aristotle Pagaltzis // <http://plasmasturm.org/>
