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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html