From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 Aug 2010 19:53:08 +0000 (-0700)
Subject: Merge branch 'jn/rebase-rename-am' into maint
X-Git-Tag: v1.7.2.3~22
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=09c6a8e66cfe51400e6e7d5086266195c7ef62bf;p=git.git

Merge branch 'jn/rebase-rename-am' into maint

* 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
---

09c6a8e66cfe51400e6e7d5086266195c7ef62bf