From: Jeff King <peff@peff.net>
Date: Wed, 30 Apr 2008 17:23:55 +0000 (-0400)
Subject: add merge.renamelimit config option
X-Git-Tag: v1.5.6-rc0~60^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2a2ac926547bc4fa91fcd1cb741dd5691ba9b974?hp=2a2ac926547bc4fa91fcd1cb741dd5691ba9b974

add merge.renamelimit config option

The point of rename limiting is to bound the amount of time
we spend figuring out inexact renames. Currently we use a
single value, diff.renamelimit, for all situations. However,
it is probably the case that a user is willing to spend more
time finding renames during a merge than they are while
looking at git-log.

This patch provides a way of setting those values separately
(though for backwards compatibility, merge still falls back
on the diff renamelimit).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---