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.html | |
| parent | 3580ad240fadb5ab479fd96c65350ec2b77c33bd (diff) | |
| download | git-htmldocs-3f2f6e5d768e1e09e959ec54a26e552b5dfc4f14.tar.gz | |
Autogenerated HTML docs for v1.6.0-90-g436ed
Diffstat (limited to 'gitattributes.html')
| -rw-r--r-- | gitattributes.html | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/gitattributes.html b/gitattributes.html index 576ee39c1..38436be72 100644 --- a/gitattributes.html +++ b/gitattributes.html @@ -649,6 +649,11 @@ patterns are available:</p></div> </li>
<li>
<p>
+<tt>python</tt> suitable for source code in the Python language.
+</p>
+</li>
+<li>
+<p>
<tt>ruby</tt> suitable for source code in the Ruby language.
</p>
</li>
@@ -657,6 +662,11 @@ patterns are available:</p></div> <tt>tex</tt> suitable for source code for LaTeX documents.
</p>
</li>
+<li>
+<p>
+<tt>html</tt> suitable for HTML/XHTML documents.
+</p>
+</li>
</ul></div>
<h3 id="_performing_a_three_way_merge">Performing a three-way merge</h3><div style="clear:left"></div>
<div class="para"><p>The attribute <tt>merge</tt> affects how three versions of a file is
@@ -900,7 +910,7 @@ frotz unspecified</tt></pre> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-08-13 20:03:51 UTC
+Last updated 2008-08-21 10:34:01 UTC
</div>
</div>
</body>
|