From f7ed48c73fb5ddbb532cd6de0778bc8e10e4992a Mon Sep 17 00:00:00 2001
From: harryob <me@harryob.live>
Date: Mon, 27 Mar 2023 22:06:33 +0100
Subject: [PATCH] changes the .gitattributes file to use the actual merge hooks
 (#2919)

because otherwise it doesn't really do much

no player facing changes
---
 .gitattributes | 52 ++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 40 insertions(+), 12 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 24b7e0c3934b..fe2bbe078cc0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,18 +1,46 @@
-# dmm map merger hook
-# needs additional setup, see tools/mapmerge/install.txt
-*.dmm merge=merge-dmm
+* text=auto
 
-# dmi icon merger hook
-# needs additional setup, see tools/dmitool/merging.txt
-*.dmi merge=merge-dmi
-
-# force changelog merging to use union
-html/changelog.html merge=union
-
-# Declare files that will always have LF line endings on checkout.
+## Enforce text mode and LF line breaks
+*.bat text eol=lf
+*.cjs text eol=lf
+*.css text eol=lf
 *.dm text eol=lf
-*.dmm text eol=lf
 *.dme text eol=lf
+*.dmf text eol=lf
+*.htm text eol=lf
+*.html text eol=lf
+*.js text eol=lf
+*.json text eol=lf
+*.jsx text eol=lf
+*.md text eol=lf
+*.ps1 text eol=lf
+*.py text eol=lf
+*.scss text eol=lf
+*.sql text eol=lf
+*.svg text eol=lf
+*.ts text eol=lf
+*.tsx text eol=lf
+*.txt text eol=lf
+*.yaml text eol=lf
 *.yml text eol=lf
 *.sh text eol=lf
 Dockerfile eol=lf
+
+## Enforce binary mode
+*.bmp binary
+*.dll binary
+*.dmb binary
+*.exe binary
+*.gif binary
+*.jpg binary
+*.png binary
+*.so binary
+
+## Merger hooks, run tools/hooks/install.bat or install.sh to set up
+*.dmm text eol=lf merge=dmm
+*.dmi binary merge=dmi
+
+## Force tab indents on dm files
+*.dm whitespace=indent-with-non-tab
+
+