Hi, On Sun, 30 Sep 2007, Bruno Haible wrote: > I don't know what "git stash apply --index" does, since it's not > documented. It's documented in code ;-) No, really, what it does is trying to reinstate not only the working tree's changes, but also the index' ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally). Now that you know what --index is supposed to do, maybe you are nice enough to extend the documentation and post a patch? Thanks, Dscho - 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