projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4e5dd04) | patch
merge-recursive: option to specify rename threshold
authorKevin Ballard <kevin@sb.org>
Mon, 27 Sep 2010 23:58:25 +0000 (16:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Sep 2010 20:15:56 +0000 (13:15 -0700)
commit10ae7526bebb505ddddba01f76ec97d5f7b5e0e5
tree9f51a2c9fabad753a2840f4d33023bed3c8d19c9tree | snapshot
parent4e5dd044c62f2a82de083e7cd46cad7b0d3465aecommit | diff
merge-recursive: option to specify rename threshold

The recursive merge strategy turns on rename detection but leaves the
rename threshold at the default. Add a strategy option to allow the user
to specify a rename threshold to use.

Signed-off-by: Kevin Ballard <kevin@sb.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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
Git—the stupid content tracker