X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgitattributes.txt;h=5fb5007413666d0b3d0aaa4c553c1fd5a67e60d9;hb=5fc3e67ac0241c491dcf1c0c9dcd4a4d83e7c243;hp=49a167f241f0832e62fb905390715e45ef5be3c4;hpb=6a42cfe86c485675987b64690e75d8821567d328;p=git.git diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 49a167f24..5fb500741 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -315,10 +315,14 @@ patterns are available: - `pascal` suitable for source code in the Pascal/Delphi 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 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~