X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.in;h=f97689006ea2155c96ee99dbc991ff78682a85b8;hb=ef0b7066f4123c815ca67e74218613803c48506a;hp=a04b7574ab23ed255839f6f7f56f7b9b050613d2;hpb=b029ee83b00588cd35c318a6a44cd350bb952190;p=config%2Fdotfiles.git

diff --git a/gitconfig.in b/gitconfig.in
index a04b757..f976890 100644
--- a/gitconfig.in
+++ b/gitconfig.in
@@ -1,6 +1,6 @@
 # Global Git configuration file.
 
-# Copyright (C) 2011-2013  Simon Ruderich
+# Copyright (C) 2011-2014  Simon Ruderich
 #
 # This file is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -161,14 +161,15 @@
 
 # Allow diffing of some binary files.
 #
-# `pdftotext-` is a wrapper around pdftotext which writes to stdout.
-# `sqlite3dump` is a wrapper calling `sqlite3 database-file .dump`.
+# "sh -c '..' -" is used when the programs require additional arguments. The
+# last "-" is argv[0] which is passed to sh, the real arguments are passed
+# after "-" by git.
 [diff "gzip"]
 	textconv = gzip -d -c
 [diff "pdf"]
-	textconv = PWD/bin/pdftotext-
+	textconv = sh -c 'exec pdftotext "$@" -' -
 [diff "sqlite"]
-	textconv = PWD/bin/sqlite3dump
+	textconv = sh -c 'exec sqlite3 "$@" .dump' -
 
 [merge]
 	tool = vimdiff