Merge commit 'jk/renamelimit^1' into next
commit558e85db9581b365cb74fe209193967a11d2e76e
authorJunio C Hamano <gitster@pobox.com>
Sun, 4 May 2008 05:54:36 +0000 (3 22:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 May 2008 05:54:36 +0000 (3 22:54 -0700)
tree5ffd81c24dca1d86c745c43995902d81141aff9c
parentfcfeb79e8d7578ff854b053fdbb4a77bff3b7d59
parentb8960bbe7bdfc0b232462f916ee8151c83afd16f
Merge commit 'jk/renamelimit^1' into next

* commit 'jk/renamelimit^1':
  diff: make "too many files" rename warning optional
  bump rename limit defaults
  add merge.renamelimit config option
diff.c
diff.h