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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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 staged.  This doesn't normally happen.
It was intensely irritating, and required me to do "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 "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]