]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 83837ec) | patch
merge-recursive: find-renames resets threshold
authorFelipe Gonçalves Assis <felipeg.assis@gmail.com>
Sun, 21 Feb 2016 22:59:05 +0000 (19:59 -0300)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Feb 2016 18:39:02 +0000 (10:39 -0800)
commit87892f605be16037bc910ca2cf9fa21bb9467f5e
tree6f279a354a962388b3b3014b26e25a4bcff712b7tree | snapshot
parent83837ec0b43bfd832ea00cd96e8b47c90991c473commit | diff
merge-recursive: find-renames resets threshold

Make the find-renames option follow the behaviour in git-diff, where it
resets the threshold when none is given. So, for instance,
"--find-renames=25 --find-renames" should result in the default
threshold (50%) instead of 25%.

Signed-off-by: Felipe Gonçalves Assis <felipegassis@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.