diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-08-21 10:34:22 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-08-21 10:34:22 +0000 |
| commit | 3f2f6e5d768e1e09e959ec54a26e552b5dfc4f14 (patch) | |
| tree | d4d3b9e33da31ec8fb99af5d4376194ac84fbfa6 /gitattributes.txt | |
| parent | 3580ad240fadb5ab479fd96c65350ec2b77c33bd (diff) | |
| download | git-htmldocs-3f2f6e5d768e1e09e959ec54a26e552b5dfc4f14.tar.gz | |
Autogenerated HTML docs for v1.6.0-90-g436ed
Diffstat (limited to 'gitattributes.txt')
| -rw-r--r-- | gitattributes.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gitattributes.txt b/gitattributes.txt index db16b0ca5..5495d695c 100644 --- a/gitattributes.txt +++ b/gitattributes.txt @@ -316,10 +316,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 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |