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

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 27, 2010, 05:24 UTC
Message-ID: <7vocbj3gjk.fsf@alter.siamese.dyndns.org>
In-Reply-To: <D5046A0E-7A35-421D-856F-5278FBE02914@sb.org>

Kevin Ballard <kevin@sb.org> writes:

Show 10 quoted lines

>> 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...

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