On Fri, Aug 21, 2009 at 05:26:19PM +0200, Thomas Rast wrote: > > It is spelled "git reset --merge" (though --merge was introduced in > > v1.6.1; prior to that, you had to use "git reset --hard"). > > Umm, no, you still have to use "git reset --hard". Ah, sorry, you are right. I have never actually used "--merge", but I knew based on this thread: http://article.gmane.org/gmane.comp.version-control.git/102067 that the point was to carry dirty state across a reset. So I assumed you could use it to reset a failed merge while leaving dirty state in files unrelated to the merge. But it doesn't actually handle unmerged entries at all. Thanks for correcting me. The downside, of course, of "git reset --hard" is that it kills off any dirty state you may have wanted to keep. -Peff -- 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