Could somebody explain me the difference between a .diff file and .patch file.
There are no differences. diff utility produces a patch file which is applied using patch.
diff
patch