On Thu, 10 Sep 2009, Christian Couder wrote: > > In fact with "--merge-dirty", changes that are both in > the work tree and the index are kept in the work tree > after the reset (but discarded in the index). As with > "--merge", changes that are in both the work tree and > the index are discarded after the reset. Can you explain that again? That paragraph makes no sense, because it boils down to saying two different thing for "changes that are in both the work tree and the index". First it says such changes are kept in the work tree (but discarded in the index), and then it says that the changes are discarded. Which seems very odd. Or are my reading comprehension skills lacking? The patch also seems to imply that it's always about HEAD. True? Linus -- 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