summaryrefslogtreecommitdiffstats
path: root/Documentation/gitattributes.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-25 10:40:11 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-25 10:40:11 -0700
commitc4eed8689b635e4c27759479afd656ea770607b7 (patch)
tree6707e3f8134a22da40e0248f167d3d1498654242 /Documentation/gitattributes.txt
parentb1bb02dede05e26ae39908ae4ad35f011583bd50 (diff)
parente90d065e64702d09fbdfc7cfd1c97456c7faa74c (diff)
downloadgit-c4eed8689b635e4c27759479afd656ea770607b7.tar.gz
git-c4eed8689b635e4c27759479afd656ea770607b7.tar.xz
Merge branch 'aj/xfuncname-ada'
* aj/xfuncname-ada: Add userdiff patterns for Ada
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 462b79c12..99ed04d7a 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -511,6 +511,8 @@ configuration file (you still need to enable this with the
attribute mechanism, via `.gitattributes`). The following built in
patterns are available:
+- `ada` suitable for source code in the Ada language.
+
- `bibtex` suitable for files with BibTeX coded references.
- `cpp` suitable for source code in the C and C++ languages.