diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:49:23 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:49:23 -0700 |
commit | 083dd39ed4477dc24473986f92e1a1b01f0cfc79 (patch) | |
tree | cd12d4a3255850bc8d3640eece48a52d9b661121 /Documentation/gitattributes.txt | |
parent | 2a1be3f8c41a4eefa8842d01d246ef8111245414 (diff) | |
parent | 909a5494f869371565ed9326e984adeabf42611d (diff) | |
download | git-083dd39ed4477dc24473986f92e1a1b01f0cfc79.tar.gz |
Merge branch 'bc/fortran-userdiff'
* bc/fortran-userdiff:
userdiff.c: add builtin fortran regex patterns
Diffstat (limited to 'Documentation/gitattributes.txt')
-rw-r--r-- | Documentation/gitattributes.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index ed03e2a4aa..c80ca5da43 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -484,6 +484,8 @@ patterns are available: - `csharp` suitable for source code in the C# language. +- `fortran` suitable for source code in the Fortran language. + - `html` suitable for HTML/XHTML documents. - `java` suitable for source code in the Java language. |