On Fri, Aug 21, 2009 at 10:51:57PM +0800, bill lam wrote: > How to abort a merge if it said there are conflicts but I do not want > to (or can not) resolve it for the moment. I can not find the --abort > option as that for git-rebase. It is spelled "git reset --merge" (though --merge was introduced in v1.6.1; prior to that, you had to use "git reset --hard"). I don't know if it is worth adding "git merge --abort" as syntactic sugar. -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