Hi, I'm not sure if this is a bug or if it should be thus. Basically, a 'git stash --keep-index' followed immediately by a 'git stash pop' (no changes made) will result in a conflict. Steps to reproduce: Put "AAA BBB CCC" into file 'test' $ git add test $ git commit -m "A" Append lines "DDD EEE FFF GGG" into file 'test' $ git add -p Press 'e' and remove the "FFF" and "GGG" files from the patch, to stage only the "DDD" and "EEE" files. $ git stash --keep-index $ git stash pop CONFLICT I hope that's clear enough. Cheers, Tim. _________________________________________________________________ Link all your email accounts and social updates with Hotmail. Find out now. http://windowslive.ninemsn.com.au/oneinbox?ocid=T162MSN05A0710G-- 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