From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 21 Jun 2026 23:41:37 +0000 (-0700)
Subject: Merge branch 'kw/gitattributes-typofix'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cf57cbec4de63ad41e8b3c705505771784abf50;p=thirdparty%2Fgit.git

Merge branch 'kw/gitattributes-typofix'

* kw/gitattributes-typofix:
  gitattributes: fix eol attribute for Perl scripts
---

8cf57cbec4de63ad41e8b3c705505771784abf50
diff --cc .gitattributes
index 556322be01,0eb2f58017..26490ad60a
--- a/.gitattributes
+++ b/.gitattributes
@@@ -1,8 -1,8 +1,8 @@@
 -* whitespace=!indent,trail,space
 -*.[ch] whitespace=indent,trail,space diff=cpp
 -*.sh whitespace=indent,trail,space text eol=lf
 +* whitespace=trail,space
 +*.[ch] whitespace=indent,trail,space,incomplete diff=cpp
 +*.sh whitespace=indent,trail,space,incomplete text eol=lf
  *.perl text eol=lf diff=perl
- *.pl text eof=lf diff=perl
+ *.pl text eol=lf diff=perl
  *.pm text eol=lf diff=perl
  *.py text eol=lf diff=python
  *.bat text eol=crlf