On Tue, Mar 06, 2012 at 02:38:16PM +0100, Matthieu Moy wrote: > Michal Privoznik <mprivozn@xxxxxxxxxx> writes: > > > Okay guys. I'll got with diff.algorithm = [patience | minimal | > > histogram | myers] then. What I am not sure about is how to threat case > > when user have say algorithm = patience set in config but want to use > > myers. I guess we need --myers option then, don't we? > > At this point, maybe it's time to have > --diff-algorithm=[patience|minimal|histogram|myers], and keep > --patience, --minimal and --histogram just as compatibility aliases. > > Having one option per algorithm feels wrong ... Yeah, that was going to be my suggestion, too. And explaining it that way in the docs will make it clear that "--histogram" overrides "--patience" and so forth. -Peff -- 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