diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-23 14:38:16 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-23 14:38:16 +0900 |
| commit | e3ab3e8a3994c916bdab540ce5d49e1755223fcf (patch) | |
| tree | 13e8aa9a18c2c9f56cf7a0754aa2b9a583dc263d | |
| parent | Merge branch 'sb/oid-object-info' (diff) | |
| parent | .gitattributes: add a diff driver for Python (diff) | |
| download | git-e3ab3e8a3994c916bdab540ce5d49e1755223fcf.tar.gz git-e3ab3e8a3994c916bdab540ce5d49e1755223fcf.zip | |
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-- | .gitattributes | 6 |
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 |