On Fri, Oct 15, 2010 at 22:13, Pretty Boy Floyd <boxerab@xxxxxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html