]> git.ipfire.org Git - thirdparty/git.git/commit - diff.c
Support 'diff=pgm' attribute
authorJunio C Hamano <junkio@cox.net>
Mon, 23 Apr 2007 00:52:55 +0000 (17:52 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 23 Apr 2007 05:16:14 +0000 (22:16 -0700)
commitf1af60bdba465779df92090ed370988f202ff043
treec601842acbc36c310701f6e3f00d79364e42da86
parentd83c9af5c6a437ddaa9dd2747e83aee642501a44
Support 'diff=pgm' attribute

This enhances the attributes mechanism so that external programs
meant for existing GIT_EXTERNAL_DIFF interface can be specifed
per path.

To configure such a custom diff driver, first define a custom
diff driver in the configuration:

[diff "my-c-diff"]
command = <<your command string comes here>>

Then mark the paths that you want to use this custom driver
using the attribute mechanism.

*.c diff=my-c-diff

The intent of this separation is that the attribute mechanism is
used for specifying the type of the contents, while the
configuration mechanism is used to define what needs to be done
to that type of the contents, which would be specific to both
platform and personal taste.

Signed-off-by: Junio C Hamano <junkio@cox.net>
builtin-diff.c
combine-diff.c
diff.c
diff.h
t/t4020-diff-external.sh [new file with mode: 0755]