"Tim Visher" <tim.visher@xxxxxxxxx> writes:
> On Mon, Dec 22, 2008 at 5:52 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
>
>> That sounds like "git checkout --theirs"...
>
> I'm sorry, Junio. I don't mean to be dense but I can't find that in
> the docs and when I execute it it comes back as an unknown command.
Hmph, I meant to point you at:
http://www.kernel.org/pub/software/scm/git/docs/git-checkout.html
I think you can use "git checkout-index --stage=3 path" if your git is
older than that one with the option.
v1.6.0.1-15-g38901a4 (checkout --ours/--theirs: allow checking out one
side of a conflicting merge, 2008-08-30) introduced the feature.
--
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
