From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 05 Jul 2008 17:40:16 GMT
Subject: Re: About -X<option>
Message-ID: <7v63rktekf.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <AB745D70-D23A-4742-A5B3-DC1B6CAD9C30@ai.rug.nl>

Pieter de Bie <frimmirf@gmail.com> writes:

> On 5 jul 2008, at 15:32, Miklos Vajna wrote:
>
>> As a user I would think that it tells git-merge to first try
>> 'recursive'
>> then 'theirs'.
>>
>
> I agree with this. Perhaps there's an easy fix: how about a colon?
>
> 	git pull -s recursive:theirs
>
> might be more intuitive?

How would you do the equivalent of

	git pull -s recursive -Xsubtree="My Playpen/" -Xours

with the syntax?

Note that the current scripted "pull" and "merge" has a limitation that it
does not allow $IFS in -X<option> but that is not a designed-in limitation
but purely comes from a lazy implementation .

Also I do not see why -X<option> is not easy with parseopt() as Dscho
claimed in the original message in this thread...