问题
The git diff manual says...
Chunk header format is modified to prevent people from accidentally feeding it to patch -p1. Combined diff format was created for review of merge commit changes, and was not meant for apply. The change is similar to the change in the extended index header...
Sometimes it would be nice to feed it to patch though. Is there a way to convert a combined diff into a normal one which is suitable for diff/git apply?
来源：https://stackoverflow.com/questions/23923830/transform-a-combined-diff-into-a-patch