summaryrefslogtreecommitdiffstats
path: root/gitattributes.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-10-10 15:31:42 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-10-10 15:31:42 +0000
commita476efaaca349e01dfbc4e1009ab534aa511479b (patch)
treeb0f05e148f284deb9030edaf25419f9f704adb32 /gitattributes.html
parent7cc912979feaec3ed65d4491e129ed48507f6994 (diff)
downloadgit-htmldocs-a476efaaca349e01dfbc4e1009ab534aa511479b.tar.gz
Autogenerated HTML docs for v1.6.0.2-514-g23abd3
Diffstat (limited to 'gitattributes.html')
-rw-r--r--gitattributes.html11
1 files changed, 8 insertions, 3 deletions
diff --git a/gitattributes.html b/gitattributes.html
index 885d0ff5b..eb8e9337a 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -612,13 +612,13 @@ for paths.</p></div>
<div class="content">
<pre><tt>*.tex diff=tex</tt></pre>
</div></div>
-<div class="para"><p>Then, you would define a "diff.tex.funcname" configuration to
+<div class="para"><p>Then, you would define a "diff.tex.xfuncname" configuration to
specify a regular expression that matches a line that you would
want to appear as the hunk header "TEXT", like this:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>[diff "tex"]
- funcname = "^\\(\\\\\\(sub\\)*section{.*\\)$"</tt></pre>
+ xfuncname = "^(\\\\(sub)*section\\{.*)$"</tt></pre>
</div></div>
<div class="para"><p>Note. A single level of backslashes are eaten by the
configuration file parser, so you would need to double the
@@ -648,6 +648,11 @@ patterns are available:</p></div>
</li>
<li>
<p>
+<tt>objc</tt> suitable for source code in the Objective-C language.
+</p>
+</li>
+<li>
+<p>
<tt>pascal</tt> suitable for source code in the Pascal/Delphi language.
</p>
</li>
@@ -943,7 +948,7 @@ frotz unspecified</tt></pre>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-09-19 06:33:19 UTC
+Last updated 2008-10-10 15:30:51 UTC
</div>
</div>
</body>