Merge branch 'fc/apply-p2-get-header-name' into next
commit05a8e9484d6031099a2a455d0e1c2ec47ffaa79c
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 22:39:39 +0000 (17 14:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 22:39:39 +0000 (17 14:39 -0800)
tree78e37489ce1d7ce2a6f3f2b431eac70518f06bf7
parentef3b791ef177689518a21c1be8af33a547b1faa5
parentaae1f6acf1984f4ae4453ad299a1fa4d261fb188
Merge branch 'fc/apply-p2-get-header-name' into next

* fc/apply-p2-get-header-name:
  test: git-apply -p2 rename/chmod only
  Fix git-apply with -p greater than 1
builtin/apply.c