From 84b1afd12b653142c7bb573e1567934947513025 Mon Sep 17 00:00:00 2001 From: Mike Bland Date: Sat, 23 Dec 2023 17:56:22 -0500 Subject: [PATCH] Use top level .gitattributes for entire project I'd originally only set them for strcalc/src/main/frontend by mistake in commit e8aa28b53bc8d5fab160998da78f076847273c3d from #71. --- .gitattributes | 15 ++++++++------- strcalc/src/main/frontend/.gitattributes | 5 ----- 2 files changed, 8 insertions(+), 12 deletions(-) delete mode 100644 strcalc/src/main/frontend/.gitattributes diff --git a/.gitattributes b/.gitattributes index 097f9f9..23f9191 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,9 +1,10 @@ -# -# https://help.github.com/articles/dealing-with-line-endings/ -# -# Linux start script should use lf -/gradlew text eol=lf +# Ensure line endings remain LF on Windows, instead of getting +# translated to CRLF. Otherwise, Bash chokes on \r characters. +# - https://help.github.com/articles/dealing-with-line-endings/ +# - https://stackoverflow.com/a/47187309 +* text eol=lf -# These are Windows script files and should use crlf -*.bat text eol=crlf +# Windows-specific files use CRLF +*.bat text eol=crlf +gradle/wrapper/gradle-wrapper.jar binary diff --git a/strcalc/src/main/frontend/.gitattributes b/strcalc/src/main/frontend/.gitattributes deleted file mode 100644 index 9c260b5..0000000 --- a/strcalc/src/main/frontend/.gitattributes +++ /dev/null @@ -1,5 +0,0 @@ -# Ensure line endings remain LF on Windows, instead of getting -# translated to CRLF. Otherwise, Bash chokes on \r characters. -# - https://help.github.com/articles/dealing-with-line-endings/ -# - https://stackoverflow.com/a/47187309 -* text eol=lf