From: Pieter de Bie <frimmirf@gmail.com>
Date: Sat, 05 Jul 2008 13:48:07 GMT
Subject: Re: About -X<option>
Message-ID: <AB745D70-D23A-4742-A5B3-DC1B6CAD9C30@ai.rug.nl>
In-Reply-To: <20080705133245.GH4729@genesis.frugalware.org>


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?