Re: git-difftool

From: Matthieu Moy <matthieu.moy@imag.fr>
Date: Jan 2, 2009, 16:10 UTC
Message-ID: <vpq63kxofi3.fsf@bauges.imag.fr>
In-Reply-To: <200901020113.32082.markus.heidelberg@web.de>

Markus Heidelberg <markus.heidelberg@web.de> writes:

Show 10 quoted lines

> Matthieu Moy, 01.01.2009:
>> "David Aguilar" <davvid@gmail.com> writes:
>> 
>> > Hmm... in theory, yes, but in practice, no.
>> > xxdiff is too gimp to handle what 'git diff' hands it =)
>> 
>> As done with "vimdiff" in another message, simply write a one-liner
>> wrapper script that calls xxdiff $2 $3, and call this wrapper script.
>
> This works with GUI tools, but not with console tools.

Actually, it does if you call git --no-pager.

Show 6 quoted lines

> GVim works, Vim
> doesn't.
> And invoking
>     git difftool
> is by far more convenient than
>     GIT_EXTERNAL_DIFF=vimdiff git diff

Right, but a script "git-difftool" calling the later is a one-liner, so 2 one-liners give you the same result as the ~500 lines script proposed. And GIT_EXTERNAL_DIFF has the great advantage of being maintained together with git, and will most likely handle all cases (diff between index, working tree, arbitrary commit, ...) correctly.

-- 
Matthieu