diff options
author | Junio C Hamano <junio@kernel.org> | 2010-05-09 07:24:48 +0000 |
---|---|---|
committer | Junio C Hamano <junio@kernel.org> | 2010-05-09 07:24:48 +0000 |
commit | cb39aea01e29cf8ff7b0b7d2e8e8c0130292cfe2 (patch) | |
tree | 2708f18cd961765994c15549e7aeef53041d74fe /gitattributes.html | |
parent | 2b3ee5d004d9924b235a46bba46dace1e7cd7630 (diff) | |
download | git-htmldocs-cb39aea01e29cf8ff7b0b7d2e8e8c0130292cfe2.tar.gz |
Autogenerated HTML docs for v1.7.1-78-g212f0
Diffstat (limited to 'gitattributes.html')
-rw-r--r-- | gitattributes.html | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/gitattributes.html b/gitattributes.html index 17ceee6d5..ed1ff5278 100644 --- a/gitattributes.html +++ b/gitattributes.html @@ -758,6 +758,25 @@ should generate it separately and send it as a comment _in addition to_ the usual binary diff that you might send.</td>
</tr></table>
</div>
+<div class="para"><p>Because text conversion can be slow, especially when doing a
+large number of them with <tt>git log -p</tt>, git provides a mechanism
+to cache the output and use it in future diffs. To enable
+caching, set the "cachetextconv" variable in your diff driver's
+config. For example:</p></div>
+<div class="listingblock">
+<div class="content">
+<pre><tt>[diff "jpg"]
+ textconv = exif
+ cachetextconv = true</tt></pre>
+</div></div>
+<div class="para"><p>This will cache the result of running "exif" on each blob
+indefinitely. If you change the textconv config variable for a
+diff driver, git will automatically invalidate the cache entries
+and re-run the textconv filter. If you want to invalidate the
+cache manually (e.g., because your version of "exif" was updated
+and now produces better output), you can remove the cache
+manually with <tt>git update-ref -d refs/notes/textconv/jpg</tt> (where
+"jpg" is the name of the diff driver, as in the example above).</p></div>
<h3 id="_performing_a_three_way_merge">Performing a three-way merge</h3><div style="clear:left"></div>
<h4 id="_tt_merge_tt"><tt>merge</tt></h4>
<div class="para"><p>The attribute <tt>merge</tt> affects how three versions of a file is
@@ -1057,7 +1076,7 @@ frotz unspecified</tt></pre> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-04-24 02:56:13 UTC
+Last updated 2010-05-09 07:24:21 UTC
</div>
</div>
</body>
|