Merge branch 'fc/apply-p2-get-header-name'
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Nov 2010 01:52:33 +0000 (17:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Nov 2010 01:52:33 +0000 (17:52 -0800)
commitf3f973a0176d5fe7870ca4f27085d347b96307d2
tree54da604815be1eff8ba67c49130121f7a7a5d1a5
parented8298dc34234a55fc0e90e5ae284ae5f572a436
parentaae1f6acf1984f4ae4453ad299a1fa4d261fb188
Merge branch 'fc/apply-p2-get-header-name'

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