https://tanguy.ortolo.eu/blog/article95/diff-or-patch en a blog about Debian and self-hosting Tue, 11 Jun 2013 00:58:00 +0000 PluXml https://tanguy.ortolo.eu/blog/article95/diff-or-patch/#c1370912287-1 https://tanguy.ortolo.eu/blog/article95/diff-or-patch/#c1370912287-1 I use .diff and if I get a .patch file, it gets renamed to .diff immediately. Either is fine, they both represent the DIFFerences between files. Tue, 11 Jun 2013 00:58:00 +0000 wa https://tanguy.ortolo.eu/blog/article95/diff-or-patch/#c1361199612-1 https://tanguy.ortolo.eu/blog/article95/diff-or-patch/#c1361199612-1 @mirabilos : If I was in such a case, I would use .dif I think. But I do not use so outdated and poorly conceived systems, fortunately. Mon, 18 Feb 2013 15:00:00 +0000 Tanguy https://tanguy.ortolo.eu/blog/article95/diff-or-patch/#c1361199438-1 https://tanguy.ortolo.eu/blog/article95/diff-or-patch/#c1361199438-1 Both, but I’d still like to see a good three-letter word for it. You know, for 8.3 filenames. Mon, 18 Feb 2013 14:57:00 +0000 mirabilos https://tanguy.ortolo.eu/blog/article95/diff-or-patch/#c1361029776-1 https://tanguy.ortolo.eu/blog/article95/diff-or-patch/#c1361029776-1 I use .diff unless I intend to send it to someone else to apply as a patch. I can handle the disconnect between the .diff ending and application as a patch, but I don't assume that others can. Sat, 16 Feb 2013 15:49:00 +0000 Alex https://tanguy.ortolo.eu/blog/article95/diff-or-patch/#c1361021939-1 https://tanguy.ortolo.eu/blog/article95/diff-or-patch/#c1361021939-1 bike shed dogpile! Sat, 16 Feb 2013 13:38:00 +0000 barak https://tanguy.ortolo.eu/blog/article95/diff-or-patch/#c1361018934-1 https://tanguy.ortolo.eu/blog/article95/diff-or-patch/#c1361018934-1 Agreed with Josh (first comment) Sat, 16 Feb 2013 12:48:00 +0000 Peter Eisentraut https://tanguy.ortolo.eu/blog/article95/diff-or-patch/#c1360998369-1 https://tanguy.ortolo.eu/blog/article95/diff-or-patch/#c1360998369-1 Never thought about it, but I'm not a developer. I'll take as a good suggestion, thanks. Sat, 16 Feb 2013 07:06:00 +0000 Giancarlo https://tanguy.ortolo.eu/blog/article95/diff-or-patch/#c1360959844-1 https://tanguy.ortolo.eu/blog/article95/diff-or-patch/#c1360959844-1 I don't want to apply anything with `patch` anymore since we got git, a more modern interface to patches, including three-way merging and the default atomic apply or fail. With git in mind, a .diff file is diff or git diff output and .patch is a file in git patch format, with commit message and diff together. Fri, 15 Feb 2013 20:24:00 +0000 Mich