From: Sean Date: Thu, 21 Dec 2006 08:31:00 GMT Subject: Re: [PATCH] Attempt to make git-checkout man page a bit more clear. Message-ID: In-Reply-To: <7vbqlx1yht.fsf@assigned-by-dhcp.cox.net> On Wed, 20 Dec 2006 23:47:42 -0800 Junio C Hamano 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 in the third form to ? Would you like an updated patch or will you just make the touch up(s) yourself? Sean