From: Tor Arntsen <tor@spacetec.no>
Date: Mon, 18 Oct 2010 09:33:36 GMT
Subject: Re: Git Stash stages files if there is a conflict
Message-ID: <AANLkTimrVgegd4mHsEbhs3O78T=zkF4Ns7F2LMEKjm=C@mail.gmail.com>
In-Reply-To: <loom.20101015T220924-952@post.gmane.org>

On Fri, Oct 15, 2010 at 22:13, Pretty Boy Floyd <boxerab@gmail.com> wrote:
> Hello!
>
> I am running msysgit 1.7.3.1.  If I run stash apply, and there is a conflict,
> all of my stash changes get staged. Is this the correct behaviour? I found it a
> little surprising.

I have no answer to the above, just noting that I observed exactly the
same yesterday (git 1.7.1) and was a little surprised too. Not that it
created any problems as such, just raised eyebrows.

[..]

-Tor