mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

difftool: Allow specifying unconfigured commands with --extcmd

Browse Source 
git-difftool requires difftool.<tool>.cmd configuration even when
tools use the standard "$diffcmd $from $to" form.  This teaches
git-difftool to run these tools in lieu of configuration by
allowing the command to be specified on the command line.

Reference: http://article.gmane.org/gmane.comp.version-control.git/133377
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
David Aguilar
2010-01-09 20:02:42 -08:00
committed by Junio C Hamano
parent 61ed71dcff
commit 1c6f5b52b7
4 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git-difftool.perl
View File

@ -62,6 +62,10 @@ sub generate_command
$skip_next = 1;
next;
}
if ($arg =~ /^--extcmd=/) {
$ENV{GIT_DIFFTOOL_EXTCMD} = substr($arg, 9);
next;
}
if ($arg =~ /^--tool=/) {
$ENV{GIT_DIFF_TOOL} = substr($arg, 7);
next;