Hi, On Mon, 4 Dec 2006, Junio C Hamano wrote: > * Marked as RFC because I suspect I am missing a valid use case > where a user might want to say "reset" as part of continuing > the conflicted merge resolution, although I do not think of > any offhand... I can only speak for myself, of course: When I use git-reset in a merge, more often than not I use "--hard", in which case I want to try something different. So yes, I like this patch. The only possible exception I can think of: git-reset --mixed when a merge failed. Ciao, Dscho - 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