summaryrefslogtreecommitdiffstats
path: root/gitattributes.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-05-21 14:57:53 +0000
committerJunio C Hamano <junio@kernel.org>2010-05-21 14:57:53 +0000
commitcc7636a7aa705986cedababd3173cad477491003 (patch)
treed5f2c5aeadb840264c0881528637d5c124b615a7 /gitattributes.html
parente97d5771c3fcb22302e27b6f962375a059cdcb13 (diff)
downloadgit-htmldocs-cc7636a7aa705986cedababd3173cad477491003.tar.gz
Autogenerated HTML docs for v1.7.1-226-g770c5
Diffstat (limited to 'gitattributes.html')
-rw-r--r--gitattributes.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/gitattributes.html b/gitattributes.html
index ed1ff5278..761528f41 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -706,7 +706,7 @@ patterns are available:</p></div>
</li>
</ul></div>
<h4 id="_customizing_word_diff">Customizing word diff</h4>
-<div class="para"><p>You can customize the rules that <tt>git diff --color-words</tt> uses to
+<div class="para"><p>You can customize the rules that <tt>git diff --word-diff</tt> uses to
split words in a line, by specifying an appropriate regular expression
in the "diff.*.wordRegex" configuration variable. For example, in TeX
a backslash followed by a sequence of letters forms a command, but
@@ -1076,7 +1076,7 @@ frotz unspecified</tt></pre>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-05-09 07:24:21 UTC
+Last updated 2010-05-21 14:57:20 UTC
</div>
</div>
</body>