Re: [PATCH] merge-recursive: option to specify rename threshold

Kevin Ballard [off-list ref] writes:

On Sep 26, 2010, at 10:24 PM, Junio C Hamano wrote:

quoted

Kevin Ballard [off-list ref] writes:

quoted

quoted

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.

I would call them --break-threshold and --copy-threshold respectively.

I have been happy without long option names when we originally had only
short names, but some people seem to be able to be more explicit, so...

Fair enough. Expect that naming in the next iteration of the patch.

quoted

While we are at it, would it make sense to have "merge-recursive -M20" as
a shorthand as well?

So it would be invoked like `git merge -s recursive -X M20 foo`? Looks a bit odd to me. I can add that if you think it's worthwhile though.

I agree it looks odd, too ;-)