Hi, I hope you don't mind me generating lots of noise here.. It's not obvious how to abort a merge between two trees. Would aliasing "git merge --abort" to "git reset --hard" be sensible? Is there a better way to abort a merge? Especially if you have uncommitted changes. If that idea isn't liked, instead maybe we can add a note to 'git merge --help' on how to abort. John -- 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