From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Aug 2010 19:16:31 +0000 (-0700)
Subject: Merge branch 'jn/rebase-rename-am'
X-Git-Tag: v1.7.3-rc0~74
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9c74b9440108c88802f656f2fad2e8950a4a7650;p=git.git

Merge branch 'jn/rebase-rename-am'

* jn/rebase-rename-am:
  rebase: protect against diff.renames configuration
  t3400 (rebase): whitespace cleanup
  Teach "apply --index-info" to handle rename patches
  t4150 (am): futureproof against failing tests
  t4150 (am): style fix
---

9c74b9440108c88802f656f2fad2e8950a4a7650