[git-users] git stash merge

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 stas

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

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] determine a linux kernel version of a patch file

Hi, At the beginning I'm sorry if this post is completely unrelated to this mailing list. I'm trying to find the base linux kernel version from which a patch has been created and posted to LKML. Most patches contain the index line. Is it the well known git index (staging area) ? Can I use the i