Re: "git stash pop" is doing an unwanted "git add" when there are conflicts.

Hello, Jeff. On Tue, Dec 29, 2015 at 02:53:30AM -0500, Jeff King wrote: > On Thu, Dec 24, 2015 at 09:20:38AM +0000, Alan Mackenzie wrote: > > > It seems to be a side effect of merge-recursive to stage the results, > > > and in the no-conflict path we expli

Re: "git stash pop" is doing an unwanted "git add" when there are conflicts.

Hello, Jeff. On Tue, Dec 22, 2015 at 04:30:33AM -0500, Jeff King wrote: > On Tue, Dec 22, 2015 at 09:17:38AM +0100, Dennis Kaarsemaker wrote: > > On ma, 2015-12-21 at 14:29 +0000, Alan Mackenzie wrote: > > > Hello, git project. > > > Last night, whilst clearing out a

Re: "git stash pop" is doing an unwanted "git add" when there are conflicts.

Alan Mackenzie <a...@muc.de> wrote: on Mon, 21 Dec 2015 14:29:54 > Hello, git project. > Last night, whilst clearing out a stale "stash stack", I did "git stash > pop". There were conflicts in two files. > However, all the popped files became

"git stash pop" is doing an unwanted "git add" when there are conflicts.

t;git reset HEAD" on each of the files, none of which I wanted to commit. I searched the git-stash man page for this scenario, but found nothing about it. Surely staging all the files is a bug? -- Alan Mackenzie (Nuremberg, Germany). -- To unsubscribe from this list: send the line "unsubs