summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-08-21 23:20:51 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-08-21 23:20:51 -0700
commita0b6a9d2b2b0667bc170c864a05b3ec4635a71bb (patch)
tree1767f40391f3440d8b6e9ffb39976bec6fb707c8 /Documentation
parentMerge branch 'ab/perl-install' (diff)
parentUserdiff patterns for C# (diff)
downloadtgif-a0b6a9d2b2b0667bc170c864a05b3ec4635a71bb.tar.xz
Merge branch 'po/userdiff-csharp'
* po/userdiff-csharp: Userdiff patterns for C#
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/gitattributes.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 564586b943..2e2370ccdb 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -441,6 +441,8 @@ patterns are available:
- `cpp` suitable for source code in the C and C++ languages.
+- `csharp` suitable for source code in the C# language.
+
- `html` suitable for HTML/XHTML documents.
- `java` suitable for source code in the Java language.