From: Matthieu Moy <Matthieu.Moy@imag•fr>
To: markus.heidelberg@web•de
Cc: "David Aguilar" <davvid@gmail•com>, git@vger•kernel.org
Subject: Re: git-difftool
Date: Fri, 02 Jan 2009 17:10:44 +0100 [thread overview]
Message-ID: <vpq63kxofi3.fsf@bauges.imag.fr> (raw)
In-Reply-To: <200901020113.32082.markus.heidelberg@web.de> (Markus Heidelberg's message of "Fri\, 2 Jan 2009 01\:13\:31 +0100")
Markus Heidelberg <markus.heidelberg@web•de> writes:
> 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.
> 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
next prev parent reply other threads:[~2009-01-02 16:16 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-26 1:30 git-difftool David Aguilar
2008-12-31 16:04 ` git-difftool Matthieu Moy
2008-12-31 20:11 ` git-difftool David Aguilar
2008-12-31 21:20 ` git-difftool Boyd Stephen Smith Jr.
2009-01-01 17:58 ` git-difftool Matthieu Moy
2009-01-02 0:13 ` git-difftool Markus Heidelberg
2009-01-02 16:10 ` Matthieu Moy [this message]
2009-01-02 17:39 ` git-difftool David Aguilar
2009-01-15 22:26 ` git-difftool Markus Heidelberg
2009-01-16 5:05 ` git-difftool David Aguilar
2009-01-01 7:38 ` git-difftool Ping Yin
2009-01-02 0:04 ` git-difftool Markus Heidelberg
2009-01-02 1:59 ` git-difftool Ping Yin
2009-01-17 3:47 ` git-difftool enso
2009-01-17 4:41 ` git-difftool David Aguilar
2009-01-17 14:17 ` git-difftool Ping Yin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=vpq63kxofi3.fsf@bauges.imag.fr \
--to=matthieu.moy@imag$(echo .)fr \
--cc=davvid@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=markus.heidelberg@web$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox