git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git-difftool

From
Ping Yin <pkufranky@gmail.com>
Date
Jan 1, 2009, 07:38 UTC
Message-ID
<46dff0320812312338i5a3ee0cem702a6b67ef76e48c@mail.gmail.com>
In-Reply-To
<vpqhc4kz5zh.fsf@bauges.imag.fr>
On Thu, Jan 1, 2009 at 12:04 AM, Matthieu Moy <Matthieu.Moy@imag.fr> wrote:
Show 11 quoted lines
> David Aguilar <davvid@gmail.com> writes:
>
>> The usual use case for this script is when you have either
>> staged or unstaged changes and you'd like to see the changes
>> in a side-by-side diff viewer (e.g. xxdiff, tkdiff, etc).
>>
>>       git difftool [<filename>*]
>
> Is it not a complex way of saying
>
>        GIT_EXTERNAL_DIFF=xxdiff git diff

$ cat mydiff #!/bin/bash exec vimdiff $2 $5

then i run
$ GIT_EXTERNAL_DIFF=mydiff  git diff
but it gives me the error
Vim: Warning: Output is not to a terminal

$ ps -ef | grep vimdiff ping 20284 20283 1 15:37 pts/13 00:00:00 vimdiff /tmp/.diff_XXXQK6 index.php

Previous: David AguilarNext: Markus Heidelberg
Message 11 of 16 in “git-difftool”
  1. David AguilarDec 26, 2008
  2. Matthieu MoyDec 31, 2008
  3. David AguilarDec 31, 2008
  4. Boyd Stephen Smith Jr.Dec 31, 2008
  5. Matthieu MoyJan 1, 2009
  6. Markus HeidelbergJan 2, 2009
  7. Matthieu MoyJan 2, 2009
  8. David AguilarJan 2, 2009
  9. Markus HeidelbergJan 15, 2009
  10. David AguilarJan 16, 2009
  11. Ping YinJan 1, 2009
  12. Markus HeidelbergJan 2, 2009
  13. Ping YinJan 2, 2009
  14. ensoJan 17, 2009
  15. David AguilarJan 17, 2009
  16. Ping YinJan 17, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.