From d2b11eca7eccc4dfc22a8fc1182d9341458dd9cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felipe=20Gon=C3=A7alves=20Assis?= Date: Wed, 17 Feb 2016 01:15:25 -0200 Subject: merge-recursive: option to disable renames MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The recursive strategy turns on rename detection by default. Add a strategy option to disable rename detection even for exact renames. Signed-off-by: Felipe Gonçalves Assis Signed-off-by: Junio C Hamano --- merge-recursive.h | 1 + 1 file changed, 1 insertion(+) (limited to 'merge-recursive.h') diff --git a/merge-recursive.h b/merge-recursive.h index 9e090a3470..52f0201f68 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -17,6 +17,7 @@ struct merge_options { unsigned renormalize : 1; long xdl_opts; int verbosity; + int detect_rename; int diff_rename_limit; int merge_rename_limit; int rename_score; -- cgit v1.2.3