Merge branch 'master' into patch-7

Ada.gitattributes

@@ -0,0 +1,6 @@
+# Handle line endings automatically for files detected as text
+# and leave all files detected as binary untouched.
+* text=auto
+
+# Ada files
+*.ada text diff=ada

Ballerina.gitattributes

@@ -7,7 +7,7 @@
 #
 # These files are text and should be normalized (Convert crlf => lf)
 *.bal           text
-*.css           text
+*.css           text diff=css
 *.df            text
 *.htm           text diff=html
 *.html          text diff=html

Common.gitattributes

@@ -9,6 +9,7 @@
 #
 
 # Documents
+*.bibtex text diff=bibtex
 *.doc	 diff=astextplain
 *.DOC	 diff=astextplain
 *.docx diff=astextplain
@@ -20,7 +21,7 @@
 *.rtf	 diff=astextplain
 *.RTF	 diff=astextplain
 *.md text
-*.tex text
+*.tex text diff=tex
 *.adoc text
 *.textile text
 *.mustache text

Drupal.gitattributes

@@ -19,7 +19,7 @@
 # Auto-detect text files, ensure they use LF.
 * text=auto eol=lf
 
-*.css     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
+*.css     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=css
 *.engine  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
 *.html    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=html
 *.inc     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php

Fortran.gitattributes

@@ -0,0 +1,9 @@
+# Handle line endings automatically for files detected as text
+# and leave all files detected as binary untouched.
+* text=auto
+
+# Fortran files
+*.f text diff=fortran
+*.f90 text diff=fortran
+*.f95 text diff=fortran
+*.f03 text diff=fortran

Fountain.gitattributes

@@ -0,0 +1,8 @@
+# Handle line endings automatically for files detected as text
+# and leave all files detected as binary untouched.
+* text=auto
+
+# Fountain files
+*.fountain text diff=fountain
+*.pdf binary
+*.fdx text

Go.gitattributes

@@ -2,4 +2,4 @@
 # line endings. Windows users contributing to Go will need to use a
 # modern version of git and editors capable of LF line endings.
 
-*.go -text
+*.go -text diff=golang

Java.gitattributes

@@ -6,7 +6,7 @@
 # The above will handle all files NOT found below
 #
 # These files are text and should be normalized (Convert crlf => lf)
-*.css           text
+*.css           text diff=css
 *.df            text
 *.htm           text diff=html
 *.html          text diff=html
@@ -32,7 +32,7 @@
 *.ear           binary
 *.gif           binary
 *.ico           binary
-*.jar           binary
+*.jar           binary diff=java
 *.jpg           binary
 *.jpeg          binary
 *.png           binary

Lua.gitattributes

@@ -7,4 +7,4 @@
 # Luadoc output
 # =============
 *.html      text diff=html
-*.css       text
+*.css       text diff=css

Matlab.gitattributes

@@ -4,8 +4,8 @@
 
 # Source files
 # ============
-*.m             text
+*.m             text diff=matlab
-*.mu            text
+*.mu            text diff=matlab
 
 # Caution: *.m also matches Mathematica packages.
 

Servoy.gitattributes

@@ -7,5 +7,5 @@
 *.obj -text
 *.dbi -text
 *.sec -text
-*.css -text
+*.css -text diff=css
 *.js eol=lf