Re: VC mode and git

[Steinar Bang]

>>>>> Richard Stallman <address@hidden>:

> This means that you can't undo 'git stash pop' with 'git stash'.
> 'git stash pop' is therefore a risky thing to do.

Not really. If "git stash pop" fails, git will leave the stash in place.

So if you reset your workspace with "git reset --hard HEAD" the stash
will still be there (and will still fail when applied, because of
conflicts).