| commit | 10ae7526bebb505ddddba01f76ec97d5f7b5e0e5 | |
| author | Kevin Ballard <kevin@sb.org> | |
| Mon, 27 Sep 2010 23:58:25 +0000 (27 16:58 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Sep 2010 20:15:56 +0000 (29 13:15 -0700) | ||
| tree | 9f51a2c9fabad753a2840f4d33023bed3c8d19c9 | treesnapshot (tar.gz zip) |
| parent | 4e5dd044c62f2a82de083e7cd46cad7b0d3465ae | commitdiff |
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>
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 | diffblobblamehistory | |
| diff.c | diffblobblamehistory | |
| diff.h | diffblobblamehistory | |
| merge-recursive.c | diffblobblamehistory | |
| merge-recursive.h | diffblobblamehistory |