From 2aa48bd00ee6c16c8c3447d722f2fb89303df694 Mon Sep 17 00:00:00 2001 From: Thomas Bernard Date: Sun, 4 Apr 2021 11:37:20 +0200 Subject: [PATCH] RTF have local line endings commit 3fa8c98c17b01246c3d39acbeedf4b3db4de6654 changed line ending for doc/quickstart.rtf My git then went havoc ;) I have done some investigations and it looks like the good practice is to use the local line endings for RTF files and just have *.rtf diff=astextplain in the .gitattributes file --- .gitattributes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 60f541a3..51957dab 100644 --- a/.gitattributes +++ b/.gitattributes @@ -11,6 +11,8 @@ *.lua text *.nsi text *.ini text +# RTF files produced by LibreOffice on FreeBSD/linux have LF line endings +*.rtf diff=astextplain # Declare files that will always have CRLF line endings on checkout. *.sln text eol=crlf @@ -18,7 +20,6 @@ *.vbs text eol=crlf *.vcxproj text eol=crlf *.vcxproj.filters text eol=crlf -*.rtf text eol=crlf # Denote all files that are truly binary and should not be modified. *.png binary