Re: About -X<option>

On Sat, Jul 05, 2008 at 02:57:12PM +0200, Johannes Schindelin [off-list ref] 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... ;-)