Could somebody explain me the difference between a .diff file and .patch file.
patch is a unified diff (-u), if you you do a: diff -u oldfile newfile, with patch command line, you can apply the differences to oldfile to become newfile somewhere else.
diff -u oldfile newfile