commit d2b11eca7eccc4dfc22a8fc1182d9341458dd9cb
author Felipe Gonçalves Assis <felipeg.assis@gmail.com> Wed Feb 17 01:15:25 2016 -0200
committer Junio C Hamano <gitster@pobox.com> Wed Feb 17 10:20:51 2016 -0800
tree 2d4e5a3a245f8724b17da2810cf537ec9ff86852
parent 754884255bb580df159e58defa81cdd30b5c430c

merge-recursive: option to disable renames

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 <felipegassis@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

merge-recursive.h

diff --git a/merge-recursive.h b/merge-recursive.h
index 9e090a3..52f0201 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -17,6 +17,7 @@
 	unsigned renormalize : 1;
 	long xdl_opts;
 	int verbosity;
+	int detect_rename;
 	int diff_rename_limit;
 	int merge_rename_limit;
 	int rename_score;