From: Miklos Vajna <vmiklos@frugalware.org>
Date: Sat, 05 Jul 2008 13:32:45 GMT
Subject: Re: About -X<option>
Message-ID: <20080705133245.GH4729@genesis.frugalware.org>
In-Reply-To: <alpine.DEB.1.00.0807051454060.3334@eeepc-johanness>

On Sat, Jul 05, 2008 at 02:57:12PM +0200, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> So, how about using this syntax instead?
> 
> 	git pull -s recursive,theirs
> 
> i.e. strategy terms consist of the strategy name, optionally followed by a 
> comma separated list of backend options.

As a user I would think that it tells git-merge to first try 'recursive'
then 'theirs'.

Of course you can still say that users should read the documentation,
but... ;-)