From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Sep 2010 04:11:43 GMT
Subject: Re: [PATCH] merge-recursive: option to specify rename threshold
Message-ID: <7vk4m7n7uo.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1285202724-52474-1-git-send-email-kevin@sb.org>

Kevin Ballard <kevin@sb.org> 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 ;-)

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?