From: Junio C Hamano Date: Wed, 14 May 2008 19:37:28 +0000 (-0700) Subject: Merge branch 'jk/renamelimit' (early part) X-Git-Tag: v1.5.6-rc0~60 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/adf59ec127f447aa83c84f9dbe2ae4e6417f3760?hp=--cc Merge branch 'jk/renamelimit' (early part) * 'jk/renamelimit' (early part): diff: make "too many files" rename warning optional bump rename limit defaults add merge.renamelimit config option --- adf59ec127f447aa83c84f9dbe2ae4e6417f3760