diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-05-08 22:33:08 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-05-08 22:33:08 -0700 |
commit | dd75d07899653258587b854ce0e3f7f1b90610cf (patch) | |
tree | d95fd2d3ec348a0304717f58f0b4c8931908e760 /Documentation | |
parent | 3ecaa3b6a5f707617ea610d727c696f43f8b2f0b (diff) | |
parent | b3373982667dc983b8dacf33861d25b20bafb995 (diff) | |
download | git-dd75d07899653258587b854ce0e3f7f1b90610cf.tar.gz |
Merge branch 'jk/cached-textconv'
* jk/cached-textconv:
diff: avoid useless filespec population
diff: cache textconv output
textconv: refactor calls to run_textconv
introduce notes-cache interface
make commit_tree a library function
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/gitattributes.txt | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index d892e642ed..a8500d1772 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -414,6 +414,26 @@ because it quickly conveys the changes you have made), you should generate it separately and send it as a comment _in addition to_ the usual binary diff that you might send. +Because text conversion can be slow, especially when doing a +large number of them with `git log -p`, 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: + +------------------------ +[diff "jpg"] + textconv = exif + cachetextconv = true +------------------------ + +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 `git update-ref -d refs/notes/textconv/jpg` (where +"jpg" is the name of the diff driver, as in the example above). Performing a three-way merge ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |