KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-10-29 17:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1036-local

Browse Source
This commit is contained in:
Arfon Smith
2014-10-29 20:06:40 -05:00
parent d4d6ef314d 213fce00e0
commit 0c05a6c3ac
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -108,6 +108,8 @@ See [Linguist::Generated#generated?](https://github.com/github/linguist/blob/mas
Linguist supports custom overrides for language definitions and vendored paths. Add a `.gitattributes` file to your project using the keys `linguist-language` and `linguist-vendored` with the standard git-style path matchers for the files you want to override. Linguist supports custom overrides for language definitions and vendored paths. Add a `.gitattributes` file to your project using the keys `linguist-language` and `linguist-vendored` with the standard git-style path matchers for the files you want to override.
Please note that the overrides currently only affect the language statistics for a repository and not the syntax-highlighting of files.
``` ```
$ cat .gitattributes $ cat .gitattributes
*.rb linguist-language=Java *.rb linguist-language=Java

5
lib/linguist/languages.yml
View File

@@ -962,7 +962,6 @@ Groovy:
color: "#e69f56" color: "#e69f56"
extensions: extensions:
- .groovy - .groovy
- .gradle
- .grt - .grt
- .gtpl - .gtpl
- .gvy - .gvy
@@ -1001,7 +1000,7 @@ HTML+Django:
HTML+ERB: HTML+ERB:
type: markup type: markup
tm_scope: text.html.ruby tm_scope: text.html.erb
group: HTML group: HTML
lexer: RHTML lexer: RHTML
aliases: aliases:
@@ -1571,6 +1570,8 @@ MoonScript:
type: programming type: programming
extensions: extensions:
- .moon - .moon
interpreters:
- moon
Myghty: Myghty:
extensions: extensions:

2
lib/linguist/version.rb
View File

@@ -1,3 +1,3 @@
module Linguist module Linguist
VERSION = "3.4.0" VERSION = "3.4.1"
end end