Merge branch 'fc/apply-p2-get-header-name' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 9 Dec 2010 18:36:36 +0000 (10:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 Dec 2010 18:36:36 +0000 (10:36 -0800)
commita59c87265b917eb0d1b95c73ed829d47ee2ded6b
treebcb2e1e97d65799dbc35fefc769747c52b794cbf
parent5605685a71bd65548dab56e457b15d365b4350b4
parentaae1f6acf1984f4ae4453ad299a1fa4d261fb188
Merge branch 'fc/apply-p2-get-header-name' into maint

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