diff options
| author | Felipe Gonçalves Assis <felipeg.assis@gmail.com> | 2016-02-17 03:15:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-17 18:20:51 (GMT) |
| commit | d2b11eca7eccc4dfc22a8fc1182d9341458dd9cb (patch) | |
| tree | 2d4e5a3a245f8724b17da2810cf537ec9ff86852 /merge-recursive.h | |
| parent | 754884255bb580df159e58defa81cdd30b5c430c (diff) | |
| download | git-d2b11eca7eccc4dfc22a8fc1182d9341458dd9cb.zip git-d2b11eca7eccc4dfc22a8fc1182d9341458dd9cb.tar.gz git-d2b11eca7eccc4dfc22a8fc1182d9341458dd9cb.tar.bz2 | |
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>
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 1 |
1 files changed, 1 insertions, 0 deletions
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 @@ 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; |