X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgitattributes.txt;h=db16b0ca5b8146361a379de894a1394e0950fd38;hb=652b0bbe09c909eb5aa34be8746071f1c5c0e73d;hp=d7b41142d2c843bc5460f03c73c609b1c53ff4a6;hpb=bed625540a0e1a4ba4da9962ed53c1d83d9bf509;p=git.git diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index d7b41142d..db16b0ca5 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -307,9 +307,18 @@ backslash, and zero or more occurrences of `sub` followed by There are a few built-in patterns to make this easier, and `tex` is one of them, so you do not have to write the above in your configuration file (you still need to enable this with the -attribute mechanism, via `.gitattributes`). Another built-in -pattern is defined for `java` that defines a pattern suitable -for program text in Java language. +attribute mechanism, via `.gitattributes`). The following built in +patterns are available: + +- `bibtex` suitable for files with BibTeX coded references. + +- `java` suitable for source code in the Java lanugage. + +- `pascal` suitable for source code in the Pascal/Delphi language. + +- `ruby` suitable for source code in the Ruby language. + +- `tex` suitable for source code for LaTeX documents. Performing a three-way merge