> $ git pull --strategy=recursive --strategy-option=theirs origin master > error: unknown option `strategy-option=theirs' > usage: git fetch [<options>] [<repository> [<refspec>...]] I was able to confirm that the bug still exists in the latest version of Git, 1.7.5. The docs say the option should work. This affects Phing's[1] Git Pull task[2], which always outputs the long form whenever the corresponding option is used. David [1] PHP build tool [2] http://www.phing.info/docs/guide/stable/chapters/appendixes/AppendixC-OptionalTasks.html#GitPullTask -- 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