From 3766233431853f4560e90c1c392faf64033e285c Mon Sep 17 00:00:00 2001 From: Richie Bendall Date: Sat, 9 Mar 2019 14:57:21 +1300 Subject: [PATCH 01/10] Added Java diffs --- Java.gitattributes | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Java.gitattributes b/Java.gitattributes index d7c18c1..076ccf3 100644 --- a/Java.gitattributes +++ b/Java.gitattributes @@ -6,10 +6,10 @@ # 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 -*.html text +*.htm text diff=html +*.html text diff=html *.java text *.js text *.json text @@ -32,7 +32,7 @@ *.ear binary *.gif binary *.ico binary -*.jar binary +*.jar binary diff=java *.jpg binary *.jpeg binary *.png binary From 798068f2057536a6e4388051a38e85f49889f4be Mon Sep 17 00:00:00 2001 From: Richie Bendall Date: Sat, 9 Mar 2019 15:05:27 +1300 Subject: [PATCH 02/10] Add Ada Gitattributes --- Ada.gitattributes | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 Ada.gitattributes diff --git a/Ada.gitattributes b/Ada.gitattributes new file mode 100644 index 0000000..90b58dc --- /dev/null +++ b/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 diff=ada From 694a19aa0e67da0e7f42725cdb7968b9cb5a8a7f Mon Sep 17 00:00:00 2001 From: Richie Bendall Date: Sat, 9 Mar 2019 15:08:25 +1300 Subject: [PATCH 03/10] Add bibtex support --- Common.gitattributes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Common.gitattributes b/Common.gitattributes index d993e51..c6ee55d 100644 --- a/Common.gitattributes +++ b/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 From 4df3447aa5303e58c54ac97f1f524d9472cdf87b Mon Sep 17 00:00:00 2001 From: Richie Bendall Date: Sat, 9 Mar 2019 15:08:50 +1300 Subject: [PATCH 04/10] Add text attribute --- Ada.gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ada.gitattributes b/Ada.gitattributes index 90b58dc..831845b 100644 --- a/Ada.gitattributes +++ b/Ada.gitattributes @@ -3,4 +3,4 @@ * text=auto # Ada files -*.ada diff=ada +*.ada text diff=ada From ea69e9e467e550552209ef7687c4239c7729884c Mon Sep 17 00:00:00 2001 From: Richie Bendall Date: Sat, 9 Mar 2019 15:11:32 +1300 Subject: [PATCH 05/10] Add CSS diff support --- Ballerina.gitattributes | 3 +-- Drupal.gitattributes | 2 +- Java.gitattributes | 3 +-- Lua.gitattributes | 2 +- Servoy.gitattributes | 4 ++-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Ballerina.gitattributes b/Ballerina.gitattributes index 791ddd5..da973e7 100644 --- a/Ballerina.gitattributes +++ b/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 *.html text @@ -33,4 +33,3 @@ *.jpeg binary *.png binary *.so binary - diff --git a/Drupal.gitattributes b/Drupal.gitattributes index 65efbdd..ebebc1c 100644 --- a/Drupal.gitattributes +++ b/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 diff --git a/Java.gitattributes b/Java.gitattributes index d7c18c1..37a5267 100644 --- a/Java.gitattributes +++ b/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 *.html text @@ -38,4 +38,3 @@ *.png binary *.so binary *.war binary - diff --git a/Lua.gitattributes b/Lua.gitattributes index b48a2ac..b0f7170 100644 --- a/Lua.gitattributes +++ b/Lua.gitattributes @@ -7,4 +7,4 @@ # Luadoc output # ============= *.html text -*.css text +*.css text diff=css diff --git a/Servoy.gitattributes b/Servoy.gitattributes index 1c6065f..79add6c 100644 --- a/Servoy.gitattributes +++ b/Servoy.gitattributes @@ -7,5 +7,5 @@ *.obj -text *.dbi -text *.sec -text -*.css -text -*.js eol=lf \ No newline at end of file +*.css -text diff=css +*.js eol=lf From 80d42d53e0bf03ed4d337c312a38cc18a9d63f1c Mon Sep 17 00:00:00 2001 From: Richie Bendall Date: Sat, 9 Mar 2019 15:15:56 +1300 Subject: [PATCH 06/10] Added Fortran GitAttributes --- Fortran.gitattributes | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Fortran.gitattributes diff --git a/Fortran.gitattributes b/Fortran.gitattributes new file mode 100644 index 0000000..df0aef0 --- /dev/null +++ b/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 From 74c5b363e80f153dba411a7d8b7872c265d37ef7 Mon Sep 17 00:00:00 2001 From: Richie Bendall Date: Sat, 9 Mar 2019 15:20:55 +1300 Subject: [PATCH 07/10] Added Fountain GitAttributes --- Fountain.gitattributes | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Fountain.gitattributes diff --git a/Fountain.gitattributes b/Fountain.gitattributes new file mode 100644 index 0000000..5211f80 --- /dev/null +++ b/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 From 3bb6bbe2c28f019b5418395222bc16bca489efca Mon Sep 17 00:00:00 2001 From: Richie Bendall Date: Sat, 9 Mar 2019 15:22:19 +1300 Subject: [PATCH 08/10] Add diff support for golang file --- Go.gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Go.gitattributes b/Go.gitattributes index 175ebc8..f70c678 100644 --- a/Go.gitattributes +++ b/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 From 840e49de22e29e83ffd36d8afc5a8a99eafd8649 Mon Sep 17 00:00:00 2001 From: Richie Bendall Date: Sat, 9 Mar 2019 15:31:21 +1300 Subject: [PATCH 09/10] Added HTML diffs --- Matlab.gitattributes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Matlab.gitattributes b/Matlab.gitattributes index 12d6a39..e338f94 100644 --- a/Matlab.gitattributes +++ b/Matlab.gitattributes @@ -4,8 +4,8 @@ # Source files # ============ -*.m text -*.mu text +*.m text diff=matlab +*.mu text diff=matlab # Caution: *.m also matches Mathematica packages. From b35995c1a225d97f77b3cbd16c3b4f81e15bca8a Mon Sep 17 00:00:00 2001 From: Richie Bendall Date: Sat, 9 Mar 2019 15:33:13 +1300 Subject: [PATCH 10/10] Added Matlab diff --- Matlab.gitattributes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Matlab.gitattributes b/Matlab.gitattributes index 12d6a39..e338f94 100644 --- a/Matlab.gitattributes +++ b/Matlab.gitattributes @@ -4,8 +4,8 @@ # Source files # ============ -*.m text -*.mu text +*.m text diff=matlab +*.mu text diff=matlab # Caution: *.m also matches Mathematica packages.