David wrote: [...] > In your example, you still have a TMP "rollback" point if you need to > rewind master in the event that the merge into master goes badly. And you have ORIG_HEAD and reflog (master@{1}, master@{2} etc.) as safety net. Reflog is now enabled by default. Besides unless you run prune in the meantime, even without reflogs you would be able to recover using lost-found / git-fsck output. -- Jakub Narebski Poland -- 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