Skip to content

Commit

Permalink
Update to .gitattribute; most notably, prevent auto-merging of `sou…
Browse files Browse the repository at this point in the history
…rce/base/version.h`.
  • Loading branch information
c-lipka committed Sep 11, 2018
1 parent 8a43226 commit 344ed89
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
# Override language auto-detection on GitHub.
libraries/* linguist-vendored
distribution/**/*.inc linguist-language=POV-Ray
distribution/platform-specific/windows/Insert?Menu/*.txt linguist-language=POV-Ray
**/*.pov linguist-language=POV-Ray
**/*.h linguist-language=C++
source/povms/povms.h linguist-language=C
libraries/**/*.h linguist-language=C
libraries/boost/*.h linguist-language=C++
libraries/ilmbase/*.h linguist-language=C++
libraries/openexr/*.h linguist-language=C++

# Do not auto-merge version number file.
source/base/version.h -merge

0 comments on commit 344ed89

Please sign in to comment.