Merge branch 'jk/merge-rename-ux'
commit0ce6a51b43815a34d0dbebaa799b32a83d1ea4f9
authorJunio C Hamano <gitster@pobox.com>
Sun, 20 Mar 2011 06:23:56 +0000 (19 23:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 20 Mar 2011 06:23:56 +0000 (19 23:23 -0700)
tree999ed87a9453af4848bf98a3341ceaf0801c6f95
parentedf9d719d1d05c1eb4f652782febfdfede212648
parentbebd2fd77d385f198017fe297a6c79e26b2bf61c
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
builtin/commit.c
builtin/merge.c
diff.c
diff.h
diffcore-rename.c
git-pull.sh
merge-recursive.c
merge-recursive.h