On Thu, Apr 05, 2007 at 08:36:09AM -0500, Bill Lear wrote: > After a failed merge, I want to undo things. I typically use git > reset --hard, and it works like a charm. Others have tried to use git > checkout -f, but I have cautioned that git reset --hard is really the > way to do it. Is there a difference here, or are they equivalent? Skimming through the code (and looking at the output of sh -x), it looks like both just end up executing git-read-tree --reset -u $HEAD. -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