From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 May 2018 05:04:04 +0000 (+0900)
Subject: Merge branch 'bp/merge-rename-config'
X-Git-Tag: v2.18.0-rc0~31
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6e2ba77bda8a23f911ac7e6dd8a313f4f03afb5e?hp=--cc

Merge branch 'bp/merge-rename-config'

With merge.renames configuration set to false, the recursive merge
strategy can be told not to spend cycles trying to find renamed
paths and merge them accordingly.

* bp/merge-rename-config:
merge: pass aggressive when rename detection is turned off
merge: add merge.renames config setting
merge: update documentation for {merge,diff}.renameLimit
---

6e2ba77bda8a23f911ac7e6dd8a313f4f03afb5e