Re: Is it possible to roll back unstaged changes while leaving the staged ones for the next commit?

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 17, 2008, 22:59 UTC
Message-ID: <7vbpvajtmd.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <c115fd3c0812171448o3db6f4c1oc24e39f9a68ed1d3@mail.gmail.com>

"Tim Visher" <tim.visher@gmail.com> writes:

Show 14 quoted lines

> On Wed, Dec 17, 2008 at 3:30 PM, Junio C Hamano <gitster@pobox.com> wrote:
> ...
>>  (1) if you want to get rid of garbage changes in your work tree, you
>>     would want "git checkout $that_path";
>>
>>  (2) if you want to temporarily stash away further changes in your work
>>     tree, because you would want to first test what is staged, commit it,
>>     and then later continue to refine the changes stashed away thusly,
>>     you would want "git stash --keep-index".
> ...
> Unfortunately I couldn't figure out how to do this.  The solution I
> came up with was to go ahead and `git commit` the staged changes and
> then `git checkout PATH` the just committed file to overwrite the
> local edits with the version of the file I wanted.

How about omitting the "git commit" and do "git checkout PATH" after you are done with the staging? IOW, (1) above.