git.99rst.org Git - git.git/commit

author	Ben Peart <redacted>
	Wed, 2 May 2018 16:01:14 +0000 (16:01 +0000)
committer	Junio C Hamano <redacted>
	Tue, 8 May 2018 07:19:41 +0000 (16:19 +0900)
commit	85b460305ce7ed399c83499851f46c4f870ce280
tree	d56e1f9c1c1ab077050a6332365868e39ce5a485	tree \| snapshot
parent	a7152e9d226652e6ceaa64f099fc628aa2a909bd	commit \| 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 <redacted>
Helped-by: Elijah Newren <redacted>
Signed-off-by: Ben Peart <redacted>
Reviewed-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>

RSS Atom

git clone https://git.99rst.org/PROJECT

Documentation/merge-config.txt		diff \| blob \| history
Documentation/merge-strategies.txt		diff \| blob \| history
diff.c		diff \| blob \| history
diff.h		diff \| blob \| history
merge-recursive.c		diff \| blob \| history
merge-recursive.h		diff \| blob \| history
t/t3034-merge-recursive-rename-options.sh		diff \| blob \| history