On Wed, 20 Dec 2006 23:47:42 -0800 Junio C Hamano <junkio@xxxxxxx> wrote: > The 'restore from arbitrary tree-ish' form does not take -m as > far as I know. > > Although it might be interesting to do a single-file three-way > merge, I do not think the command is _checkout_ anymore once it > starts doing that. Yeah, I should have caught that. As well, your explanation makes me wonder if it makes sense to change <branch> in the third form to <tree-ish> ? Would you like an updated patch or will you just make the touch up(s) yourself? Sean - 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