diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-02 19:25:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-02 19:25:36 (GMT) |
| commit | f3a70e9cc6d31e3cb8158f64be13c594226bf03f (patch) | |
| tree | 390d3a46981fb7923c7d1e72666a613e0af39d26 /Documentation | |
| parent | 5501bf854ce6a3847ef0de6f6aa63f6b93e82b67 (diff) | |
| parent | 909a5494f869371565ed9326e984adeabf42611d (diff) | |
| download | git-f3a70e9cc6d31e3cb8158f64be13c594226bf03f.zip git-f3a70e9cc6d31e3cb8158f64be13c594226bf03f.tar.gz git-f3a70e9cc6d31e3cb8158f64be13c594226bf03f.tar.bz2 | |
Merge branch 'bc/fortran-userdiff' into maint
* bc/fortran-userdiff:
userdiff.c: add builtin fortran regex patterns
Diffstat (limited to 'Documentation')
| -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 e5a27d8..fbf507a 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -477,6 +477,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. |