Hi,
the -X<option> options are not really easy to convert to parseopt. This
is only one indication that the interface can be improved.
Another one: you are more likely wanting to pass backend-_specific_
options to git-merge.
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.
Hmm?
Ciao,
Dscho
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... ;-)
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?