projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a7152e9) | patch
merge: add merge.renames config setting
authorBen Peart <Ben.Peart@microsoft.com>
Wed, 2 May 2018 16:01:14 +0000 (16:01 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 07:19:41 +0000 (16:19 +0900)
commit85b460305ce7ed399c83499851f46c4f870ce280
treed56e1f9c1c1ab077050a6332365868e39ce5a485tree | snapshot
parenta7152e9d226652e6ceaa64f099fc628aa2a909bdcommit | diff
merge: add merge.renames config setting

Add the ability to control rename detection for merge via a config setting.
This setting behaves the same and defaults to the value of diff.renames but only
applies to merge.

Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Helped-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Ben Peart <benpeart@microsoft.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/merge-config.txt diff | blob | blame | history
Documentation/merge-strategies.txt diff | blob | blame | history
diff.c diff | blob | blame | history
diff.h diff | blob | blame | history
merge-recursive.c diff | blob | blame | history
merge-recursive.h diff | blob | blame | history
t/t3034-merge-recursive-rename-options.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.