Trying with git 1.6.0.1:
: tazenda 124 ; git apply --directory=gpxe/ < /tmp/diff
fatal: git-apply: bad git-diff - inconsistent new filename on line 105
Line 105 in the diff is:
101 diff --git a/src/arch/i386/firmware/pcbios/fakee820.c
b/src/arch/i386/firmware/pcbios/fakee820.c
102 new file mode 100644
103 index 0000000..e171edf
104 --- /dev/null
105 +++ b/src/arch/i386/firmware/pcbios/fakee820.c
What I'm trying to do here is to apply a diff created via "git diff" to
a subdirectory of another git repository.
-hpa