diff options
| author | Emilio Jesus Gallego Arias | 2019-02-26 13:44:19 +0100 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias | 2019-02-26 13:44:19 +0100 |
| commit | 45ad16bb0b85068fe7ee132eb211a4ab8b18a867 (patch) | |
| tree | 0db077c5be6c7080666810c3cd025495e31747d1 | |
| parent | 3459155e1c629a2f932c4d4d917b0f69aa89ccf7 (diff) | |
| parent | f0896b90175708921d0e0963ef5a08af36b3ae70 (diff) | |
Merge PR #9653: Fix gitattributes for Makefile.dune
| -rw-r--r-- | .gitattributes | 8 |
1 files 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 |