.gitattributes

Show log
Commit

Hash : 3e01a518
Author :
Date : 2019-02-08T15:53:29

Make .gni files always use LF endings.

This saves a lot of spam about dirty git formatting when changing
.gni files.

Bug: angleproject:3139
Change-Id: I244d5254ac6bd7bd1a7bedac5c34bd141fe0b9c0
Reviewed-on: https://chromium-review.googlesource.com/c/1460611
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

Download

.gitattributes

*                    text=auto
*.sln                eol=crlf
*.vcxproj            eol=crlf
*.vcxproj.filters    eol=crlf
*.bat                eol=crlf
*.rc                 eol=crlf
**/compiled/*.h      eol=crlf
**/shaders/gen/*.inc eol=lf
*.sh                 eol=lf
*.gn                 eol=lf
*.gni                eol=lf

# Git conflict markers in the json file break the code generator.
# Using a binary merge strategy forces a conflict without changing the file.
scripts/run_code_generation_hashes.json merge=binary

Download