diff

diff -Naur Old-Dir  New-Dir > patchfile

-N   Treat absent files as empty.
-a   Treat all files as text.
-u   Output NUM (default 3) lines of unified context.
-r   Recursively compare any subdirectories found.



－－－－－－－－－－－－－－－－－－－

总结一下：

单个文件

diff -uN  from-file  to-file  >to-file.patch
patch -p0  < to-file.patch



多个文件

diff -Naur Old-Dir  New-Dir > patchfile

cd Old-Dir

patch -Np1 < ../patchfile
patch -Np1 -i ../patchfile

patch -NRp1 -i ../patchfile

-R  --reverse  Assume patches were created with old and new files swapped.