From 57d7d4ec5b94783bf68b2959128e33c28547a6b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dagfinn=20Ilmari=20Manns=C3=A5ker?= Date: Tue, 29 Nov 2016 19:47:36 +0000 Subject: [PATCH] Add diff directives to .gitattributes This makes the function indicator in the diff chunk header and word diffs more useful for the specified languages. --- .gitattributes | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitattributes b/.gitattributes index 4dfc131..3805f90 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,11 +1,11 @@ * whitespace=space-before-tab,trailing-space -*.[chly] whitespace=space-before-tab,trailing-space,indent-with-non-tab,tabwidth=4 +*.[chly] whitespace=space-before-tab,trailing-space,indent-with-non-tab,tabwidth=4 diff=cpp *.dsl whitespace=space-before-tab,trailing-space,tab-in-indent *.patch -whitespace -*.pl whitespace=space-before-tab,trailing-space,tabwidth=4 +*.pl whitespace=space-before-tab,trailing-space,tabwidth=4 diff=perl *.po whitespace=space-before-tab,trailing-space,tab-in-indent,-blank-at-eof -*.sgml whitespace=space-before-tab,trailing-space,tab-in-indent,-blank-at-eol -*.x[ms]l whitespace=space-before-tab,trailing-space,tab-in-indent +*.sgml whitespace=space-before-tab,trailing-space,tab-in-indent,-blank-at-eol diff=html +*.x[ms]l whitespace=space-before-tab,trailing-space,tab-in-indent diff=html # Avoid confusing ASCII underlines with leftover merge conflict markers README conflict-marker-size=32 -- 2.7.4