Skip to content

Commit

Permalink
changes the .gitattributes file to use the actual merge hooks (cmss13…
Browse files Browse the repository at this point in the history
…-devs#2919)

because otherwise it doesn't really do much

no player facing changes
  • Loading branch information
hry-gh authored Mar 27, 2023
1 parent c7c8a1d commit f7ed48c
Showing 1 changed file with 40 additions and 12 deletions.
52 changes: 40 additions & 12 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -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


0 comments on commit f7ed48c

Please sign in to comment.