From: Simon Ruderich Date: Wed, 22 Nov 2017 10:07:12 +0000 (+0100) Subject: gitconfig: clarify diff commands X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=cd16f7b634107cfee3150314986040558690fa46;p=config%2Fdotfiles.git gitconfig: clarify diff commands --- diff --git a/gitconfig.in b/gitconfig.in index 5058769..846f013 100644 --- a/gitconfig.in +++ b/gitconfig.in @@ -1,6 +1,6 @@ # Global Git configuration file. -# Copyright (C) 2011-2015 Simon Ruderich +# Copyright (C) 2011-2017 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 @@ -189,15 +189,14 @@ # Allow diffing of some binary files. # -# "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. +# "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 "$@" -' - + textconv = sh -c 'exec pdftotext "$@" -' ARGV0 [diff "sqlite"] - textconv = sh -c 'exec sqlite3 "$@" .dump' - + textconv = sh -c 'exec sqlite3 "$@" .dump' ARGV0 [log] # Display branches/tag names in log (same as log's --decorate option).