]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'kw/gitattributes-typofix'
authorJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2026 23:41:37 +0000 (16:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2026 23:41:37 +0000 (16:41 -0700)
* kw/gitattributes-typofix:
  gitattributes: fix eol attribute for Perl scripts

1  2 
.gitattributes

diff --cc .gitattributes
index 556322be01b4a837320c5dc26ad4af732cd1e978,0eb2f580174cb36fc5c9d0a3baf0508b580d597d..26490ad60a74d0968eaf2f77abffcb21d78b18e3
@@@ -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