On Sep 26, 2010, at 9:11 PM, Junio C Hamano wrote: > Kevin Ballard <kevin@xxxxxx> writes: > >> The recursive merge strategy turns on rename detection but leaves the >> rename score at the default. Add a strategy option to allow the user >> to specify a rename score to use. > > Sounds straightforward, except that Documentation/diff-options.txt seems > to call the number associated with -M "threshold", not "score". The title > of the patch incidentally says threshold as well ;-) It says "threshold" because that's how the -M switch to git-diff is documented. The merge strategy option is called "rename-score" partially because that's what it's called internally, and partially because it's just an easier name to remember/type. I have no objections to calling it "rename-threshold" if you think that's better. > At the end-user level, this new option to merge-recursive has exactly the > same meaning as existing -M given to "diff" family; people would probably > want to see it made available as a synonym to "diff" family as well, no? You mean so you can type `git diff --rename-score=50% foo`? A reasonable suggestion, but then what do we do with -B and -C? It doesn't make much sense to give a longer name to only one of the three options. This patch was concerned with simply exposing the functionality to the merge strategy and doesn't attempt to address the problem of providing long names for this trio of options. -Kevin Ballard-- 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