X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgitattributes.txt;h=6f3551dc825a04628e7bcd133421093d89f01956;hb=ddf41044322825844b54a922dec2775ff6d61926;hp=5fb5007413666d0b3d0aaa4c553c1fd5a67e60d9;hpb=53b543ab8218cede7fb9383298c00dcef663692c;p=git.git diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 5fb500741..6f3551dc8 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -311,18 +311,20 @@ patterns are available: - `bibtex` suitable for files with BibTeX coded references. -- `java` suitable for source code in the Java lanugage. +- `html` suitable for HTML/XHTML documents. + +- `java` suitable for source code in the Java language. - `pascal` suitable for source code in the Pascal/Delphi language. +- `php` suitable for source code in the PHP language. + - `python` suitable for source code in the Python language. - `ruby` suitable for source code in the Ruby language. - `tex` suitable for source code for LaTeX documents. -- `html` suitable for HTML/XHTML documents. - Performing a three-way merge ~~~~~~~~~~~~~~~~~~~~~~~~~~~~