author | Junio C Hamano <junkio@cox.net> | |
Wed, 27 Apr 2005 16:21:00 +0000 (09:21 -0700) | ||
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
Wed, 27 Apr 2005 16:21:00 +0000 (09:21 -0700) | ||
commit | 77eb2720460a3061ecdf3456d96a7093565fb4e9 | |
tree | f3f51f08231d5923749cb91c8c5f4526a9650f1c | tree | snapshot |
parent | 520fc2415e83c0adfc1186ee922472c338cb4146 | commit | diff |
[PATCH] Reworked external diff interface.
This introduces three public functions for diff-cache and friends can
use to call out to the GIT_EXTERNAL_DIFF program when they wish to.
A normal "add/remove/change" entry is turned into 7-parameter process
invocation of GIT_EXTERNAL_DIFF program as before. In addition, the
program can now be called with a single parameter when diff-cache and
friends want to report an unmerged path.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This introduces three public functions for diff-cache and friends can
use to call out to the GIT_EXTERNAL_DIFF program when they wish to.
A normal "add/remove/change" entry is turned into 7-parameter process
invocation of GIT_EXTERNAL_DIFF program as before. In addition, the
program can now be called with a single parameter when diff-cache and
friends want to report an unmerged path.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
diff.c | diff | blob | history | |
diff.h | diff | blob | history |