From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 20 Mar 2011 06:23:56 +0000 (-0700)
Subject: Merge branch 'jk/merge-rename-ux'
X-Git-Tag: v1.7.5-rc0~60
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0ce6a51b43815a34d0dbebaa799b32a83d1ea4f9;p=git.git

Merge branch 'jk/merge-rename-ux'

* jk/merge-rename-ux:
  pull: propagate --progress to merge
  merge: enable progress reporting for rename detection
  add inexact rename detection progress infrastructure
  commit: stop setting rename limit
  bump rename limit defaults (again)
  merge: improve inexact rename limit warning
---

0ce6a51b43815a34d0dbebaa799b32a83d1ea4f9