mirror of
https://github.com/yiisoft/app.git
synced 2026-03-11 18:46:55 +01:00
28 lines
528 B
Plaintext
28 lines
528 B
Plaintext
# Autodetect text files
|
|
* text=auto eol=lf
|
|
|
|
# ...Unless the name matches the following overriding patterns
|
|
|
|
# Definitively text files
|
|
*.php text
|
|
*.css text
|
|
*.js text
|
|
*.txt text
|
|
*.md text
|
|
*.xml text
|
|
*.json text
|
|
*.bat text
|
|
*.sql text
|
|
*.yml text
|
|
|
|
# Ensure those won't be messed up with
|
|
*.png binary
|
|
*.jpg binary
|
|
*.gif binary
|
|
*.ttf binary
|
|
|
|
# Avoid merge conflicts in CHANGELOG
|
|
# https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/
|
|
/CHANGELOG.md merge=union
|
|
|