From: Junio C Hamano Date: Fri, 26 Feb 2016 21:37:25 +0000 (-0800) Subject: Merge branch 'fa/merge-recursive-no-rename' X-Git-Tag: v2.8.0-rc0~8 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4ce064dd813279109a4003dee8c8b63077ab473d Merge branch 'fa/merge-recursive-no-rename' "git merge-recursive" learned "--no-renames" option to disable its rename detection logic. * fa/merge-recursive-no-rename: t3034: test deprecated interface t3034: test option to disable renames t3034: add rename threshold tests merge-recursive: find-renames resets threshold merge-strategies.txt: fix typo merge-recursive: more consistent interface merge-recursive: option to disable renames --- 4ce064dd813279109a4003dee8c8b63077ab473d