X-Git-Url: https://ruderich.org/simon/gitweb/?p=config%2Fdotfiles.git;a=blobdiff_plain;f=vcs%2Fgitconfig.in;h=7b76f4197746fae1a392d1acd99f7b442cd9e2b4;hp=98702c725c92539c5120cbc5a70a6615581d48e0;hb=9fb6cc6a2d46ce2e3cc358b59a310ad631be2843;hpb=c8e829da0ee22b31ac9de44d49f01c2f5b8a3ae9 diff --git a/vcs/gitconfig.in b/vcs/gitconfig.in index 98702c7..7b76f41 100644 --- a/vcs/gitconfig.in +++ b/vcs/gitconfig.in @@ -188,16 +188,18 @@ # addition. See t/ for some tests and examples. wordRegex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_] -# Allow diffing of some binary files. +# Rules to allow diffing of some binary files. Disabled by default to prevent +# programs from running them on arbitrary files via a .local .gitattributes +# file. Copy them to .git/config of the repository to enable them. # # "sh -c '..' ARGV0" is used when the programs require additional arguments # which are passed after ARGV0 by git. -[diff "gzip"] - textconv = gzip -d -c -[diff "pdf"] - textconv = sh -c 'exec pdftotext "$@" -' ARGV0 -[diff "sqlite"] - textconv = sh -c 'exec sqlite3 "$@" .dump' ARGV0 +#[diff "gzip"] +# textconv = gzip -d -c +#[diff "pdf"] +# textconv = sh -c 'exec pdftotext "$@" -' ARGV0 +#[diff "sqlite"] +# textconv = sh -c 'exec sqlite3 "$@" .dump' ARGV0 [log] # Display branches/tag names in log (same as log's --decorate option).