aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-05-23 14:38:16 +0900
committerJunio C Hamano <gitster@pobox.com>2018-05-23 14:38:16 +0900
commite3ab3e8a3994c916bdab540ce5d49e1755223fcf (patch)
tree13e8aa9a18c2c9f56cf7a0754aa2b9a583dc263d
parentfcb6df325468a7ae12949ab80dcd37772b9b1fbf (diff)
parent7818b619e2c88eecd6410286f67c944f3d0d9caa (diff)
downloadgit-e3ab3e8a3994c916bdab540ce5d49e1755223fcf.tar.xz
Merge branch 'ab/perl-python-attrs'
We learned that our source files with ".pl" and ".py" extensions are Perl and Python files respectively and changes to them are better viewed as such with appropriate diff drivers. * ab/perl-python-attrs: .gitattributes: add a diff driver for Python .gitattributes: use the "perl" differ for Perl .gitattributes: add *.pl extension for Perl
-rw-r--r--.gitattributes6
1 files changed, 4 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes
index 8ce9c6b888..1bdc91e282 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,8 +1,10 @@
* whitespace=!indent,trail,space
*.[ch] whitespace=indent,trail,space diff=cpp
*.sh whitespace=indent,trail,space eol=lf
-*.perl eol=lf
-*.pm eol=lf
+*.perl eol=lf diff=perl
+*.pl eof=lf diff=perl
+*.pm eol=lf diff=perl
+*.py eol=lf diff=python
/Documentation/git-*.txt eol=lf
/command-list.txt eol=lf
/GIT-VERSION-GEN eol=lf