]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d2b11ec) | patch
merge-recursive: more consistent interface
authorFelipe Gonçalves Assis <felipeg.assis@gmail.com>
Wed, 17 Feb 2016 03:15:26 +0000 (01:15 -0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Feb 2016 18:20:52 +0000 (10:20 -0800)
commit1b47ad160b55f50a7a98c180e18d80f0f8f17a67
tree196dcd66914dca5b4a8329a7d54b599680a7074ctree | snapshot
parentd2b11eca7eccc4dfc22a8fc1182d9341458dd9cbcommit | diff
merge-recursive: more consistent interface

Add strategy option find-renames, following git-diff interface. This
makes the option rename-threshold redundant.

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
Unnamed repository; edit this file 'description' to name the repository.