[git-users] difference between working copy and working directory

2015-04-27 Thread Pawel Por
Hi Is there any difference between working copy and working directory ? If so what's the difference ? thanks for information -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from

[git-users] git stash merge

2015-04-20 Thread Pawel Por
Hi, I've just upgraded the linux kernel git source tree and I want to pop my stashed work. I do the following: git stash pop and I got the following message: mm/Makefile: needs merge unable to refresh index I also tried: git stash pop --index How can I overcome this obstacle. I did git stash