"Sverre Rabbelier" <alturin@xxxxxxxxx> writes: > On Fri, Jul 25, 2008 at 13:33, Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> wrote: >> 1) Maintain a list of commands that has a git-merge- prefix, but not a >> strategy. This list would currently contain "base, file, index, >> one-file and tree". > > Sounds a bit error prone, and could lead to unexpected results if/when > someone creates a new command ('git merge status' anyone?) which is > then suddenly treated as a merge strategy. > >> 2) Require custom strategies to have a different naming scheme, like >> if "foo" is a custom strategy, then it would have to be named >> git-merge-custom-foo, _not_ git-merge-foo. > > I think this is cleaner, what would be even nicer is to change the > current names too, so name them all "git-merge-stragegy-foo". I think you could retroactively impose "git-merge-strategy-" prefix rule and grandfather the existing ones by maintaining a list of them that by definition will not grow anymore. -- 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