summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-01-13 11:38:05 -0800
committerJunio C Hamano <gitster@pobox.com>2011-01-13 11:38:05 -0800
commit17e1c9e2fdf684422a91f0b1bc2e0926c1956651 (patch)
tree3741b4cb2d3df4b7e916d632cd0055afc65661b3 /Documentation/gitattributes.txt
parent17fd68d0d8f948c23993275aa618c16b83958cd8 (diff)
parenta25e47377d6a1ec1efc6972f2e5e55cf429603a1 (diff)
downloadgit-17e1c9e2fdf684422a91f0b1bc2e0926c1956651.tar.gz
Merge branch 'jn/perl-funcname'
* jn/perl-funcname: userdiff/perl: catch BEGIN/END/... and POD as headers diff: funcname and word patterns for perl
Diffstat (limited to 'Documentation/gitattributes.txt')
-rw-r--r--Documentation/gitattributes.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index a282adb31e..7e7e12168e 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -504,6 +504,8 @@ patterns are available:
- `pascal` suitable for source code in the Pascal/Delphi language.
+- `perl` suitable for source code in the Perl language.
+
- `php` suitable for source code in the PHP language.
- `python` suitable for source code in the Python language.