From charlesreid1

Creating the Patch

Directories

$ diff -rupN dir1/ dir2/ > my_patch_file.patch

Files

$ diff -u file1 file2 > my_patch_file.patch

Applying the Patch

You may need to use the -p flag when invoking patch, which strips various levels of directories from the patch file's list of files to patch.


References