From f0896b90175708921d0e0963ef5a08af36b3ae70 Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert
Date: Tue, 26 Feb 2019 13:28:20 +0100
Subject: Fix gitattributes for Makefile.dune

Since it matches *.dune and Makefile* the later needs to come second
in the gitattributes file.
---
 .gitattributes | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index fcfd795b2f..58b1a31d36 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -11,10 +11,6 @@
 # chunk, so we disable blank-at-eof.
 * -whitespace
 
-# tabs are allowed in Makefiles.
-Makefile* whitespace=blank-at-eol
-tools/CoqMakefile.in whitespace=blank-at-eol
-
 # in general we don't want tabs.
 *.asciidoc whitespace=blank-at-eol,tab-in-indent
 *.bib whitespace=blank-at-eol,tab-in-indent
@@ -59,6 +55,10 @@ dune* whitespace=blank-at-eol,tab-in-indent
 _CoqProject whitespace=blank-at-eol,tab-in-indent
 Dockerfile whitespace=blank-at-eol,tab-in-indent
 
+# tabs are allowed in Makefiles.
+Makefile* whitespace=blank-at-eol
+tools/CoqMakefile.in whitespace=blank-at-eol
+
 # CR is desired for these Windows files.
 *.bat whitespace=cr-at-eol,blank-at-eol,tab-in-indent
 
-- 
cgit v1.2.3