Skip to content

Commit 344ed89

Browse files
committed
Update to .gitattribute; most notably, prevent auto-merging of source/base/version.h.
1 parent 8a43226 commit 344ed89

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

.gitattributes

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
# Override language auto-detection on GitHub.
12
libraries/* linguist-vendored
23
distribution/**/*.inc linguist-language=POV-Ray
4+
distribution/platform-specific/windows/Insert?Menu/*.txt linguist-language=POV-Ray
35
**/*.pov linguist-language=POV-Ray
6+
**/*.h linguist-language=C++
7+
source/povms/povms.h linguist-language=C
8+
libraries/**/*.h linguist-language=C
9+
libraries/boost/*.h linguist-language=C++
10+
libraries/ilmbase/*.h linguist-language=C++
11+
libraries/openexr/*.h linguist-language=C++
12+
13+
# Do not auto-merge version number file.
14+
source/base/version.h -merge

0 commit comments

Comments
 (0)