]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7548842) | patch
merge-recursive: option to disable renames
authorFelipe Gonçalves Assis <felipeg.assis@gmail.com>
Wed, 17 Feb 2016 03:15:25 +0000 (01:15 -0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Feb 2016 18:20:51 +0000 (10:20 -0800)
commitd2b11eca7eccc4dfc22a8fc1182d9341458dd9cb
tree2d4e5a3a245f8724b17da2810cf537ec9ff86852tree | snapshot
parent754884255bb580df159e58defa81cdd30b5c430ccommit | diff
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>
Documentation/merge-strategies.txt diff | blob | blame | history
merge-recursive.c diff | blob | blame | history
merge-recursive.h diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.