From 10ae7526bebb505ddddba01f76ec97d5f7b5e0e5 Mon Sep 17 00:00:00 2001 From: Kevin Ballard Date: Mon, 27 Sep 2010 16:58:25 -0700 Subject: merge-recursive: option to specify rename threshold The recursive merge strategy turns on rename detection but leaves the rename threshold at the default. Add a strategy option to allow the user to specify a rename threshold to use. Signed-off-by: Kevin Ballard Signed-off-by: Junio C Hamano --- Documentation/merge-strategies.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Documentation') diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index 91faba5da9..77f26061d6 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -74,6 +74,10 @@ no-renormalize;; Disables the `renormalize` option. This overrides the `merge.renormalize` configuration variable. +rename-threshold=;; + Controls the similarity threshold used for rename detection. + See also linkgit:git-diff[1] `-M`. + subtree[=path];; This option is a more advanced form of 'subtree' strategy, where the strategy makes a guess on how two trees must be shifted to -- cgit v1.2.3