mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-01-29 18:31:03 +00:00
7c8bb85de3
* Update settings * Whitespace changes * Comment out merger hooks in gitattributes Corrupt maps would have to be resolved in repo before hooks could be updated * Revert "Whitespace changes" This reverts commitafbdd1d844. * Whitespace again minus example * Gitignore example changelog * Restore changelog merge setting * Keep older dmi hook attribute until hooks can be updated * update vscode settings too * Renormalize remaining * Revert "Gitignore example changelog" This reverts commitde22ad375d. * Attempt to normalize example.yml (and another file I guess) * Try again
52 lines
976 B
Plaintext
52 lines
976 B
Plaintext
* text=auto
|
|
|
|
## Enforce text mode and LF line breaks
|
|
*.bat text eol=lf
|
|
*.cjs text eol=lf
|
|
*.css text eol=lf
|
|
*.dm 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
|
|
*.sh 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
|
|
|
|
## Enforce binary mode
|
|
*.bmp binary
|
|
*.dll binary
|
|
*.dmb binary
|
|
*.exe binary
|
|
*.gif binary
|
|
*.jpg binary
|
|
*.png binary
|
|
*.so binary
|
|
*.zip binary
|
|
|
|
## Merger hooks, run tools/hooks/install.bat or install.sh to set up
|
|
#*.dmm text eol=lf merge=dmm
|
|
#*.dmi binary merge=dmi
|
|
|
|
# old dmi icon merger hook
|
|
# needs additional setup, see tools/dmitool/merging.txt
|
|
*.dmi merge=merge-dmi
|
|
|
|
## Force tab indents on dm files
|
|
*.dm whitespace=indent-with-non-tab
|
|
|
|
# force changelog merging to use union
|
|
html/changelog.html merge=union
|