summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorJoffrey Bion <joffrey.bion@gmail.com>2022-02-15 11:06:11 +0100
committerJoffrey Bion <joffrey.bion@gmail.com>2022-02-15 11:06:11 +0100
commitd5ee4896c8502911106d8930470754906919c859 (patch)
treed403fe4a9f3608076dddc0066d39060d1eab1699 /.gitattributes
parentUpgrade Gradle Wrapper to 7.4 (diff)
downloadseven-wonders-d5ee4896c8502911106d8930470754906919c859.tar.gz
seven-wonders-d5ee4896c8502911106d8930470754906919c859.tar.bz2
seven-wonders-d5ee4896c8502911106d8930470754906919c859.zip
Cleanup gitattributes, ensure proper line endings for scripts
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes22
1 files changed, 3 insertions, 19 deletions
diff --git a/.gitattributes b/.gitattributes
index 0b6acf18..de58a12b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,22 +1,6 @@
# Auto detect text files and perform LF normalization
* text=auto
-# Custom for Visual Studio
-*.cs diff=csharp
-*.sln merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
-
-# Standard to msysgit
-*.doc diff=astextplain
-*.DOC diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot diff=astextplain
-*.DOT diff=astextplain
-*.pdf diff=astextplain
-*.PDF diff=astextplain
-*.rtf diff=astextplain
-*.RTF diff=astextplain
+# Proper line endings for platform-specific scripts
+*.sh text eol=lf
+*.bat text eol=crlf
bgstack15