Re: About -X<option>

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?