[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Git help requested: "git stash pop" is doing an unwanted "git add".
Re: Git help requested: "git stash pop" is doing an unwanted "git add". Why?
Mon, 21 Dec 2015 20:26:21 +0000
On Mon, Dec 21, 2015 at 05:35:06AM +0200, Eli Zaretskii wrote:
> > Date: Sun, 20 Dec 2015 22:01:28 +0000
> > From: Alan Mackenzie <address@hidden>
> > I'm clearing out a "stash stack" in my master repository copy. I've
> > just done "git stash pop", expecting git to pop the changes into my
> > working directory.
> > Well, there were 2 files with conflicts - fair enough. But with all the
> > other files, git has had the cheek to do a "git add" (I think the jargon
> > for this is "moved the files to the staging area"), leaving me with the
> > hassle of doing a "git reset" on quite a lot of files.
> > Why has the "git stash pop" done this, and how can I call "git stash
> > pop" in the future, avoiding this annoying problem?
> It's "git stash pop", yes. You need to "git reset" after "stash pop",
> if you want to be sure the changes are not staged (a.k.a. "in the
It looks like it. I've dropped a note to the git mailing list,
suggesting that this is a bug. We'll see if anything comes of that.
Alan Mackenzie (Nuremberg, Germany).