From: Markus Heidelberg <markus.heidelberg@web•de>
To: "Ping Yin" <pkufranky@gmail•com>
Cc: "Matthieu Moy" <Matthieu.Moy@imag•fr>,
"David Aguilar" <davvid@gmail•com>,
git@vger•kernel.org
Subject: Re: git-difftool
Date: Fri, 2 Jan 2009 01:04:01 +0100 [thread overview]
Message-ID: <200901020104.01522.markus.heidelberg@web.de> (raw)
In-Reply-To: <46dff0320812312338i5a3ee0cem702a6b67ef76e48c@mail.gmail.com>
Ping Yin, 01.01.2009:
> On Thu, Jan 1, 2009 at 12:04 AM, Matthieu Moy <Matthieu.Moy@imag•fr> wrote:
> > 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
Just the warning and everything else works? For me the display is
totally screwed up and the commands don't really work because of the
pager. I have to add GIT_PAGER="" to get it working.
Markus
next prev parent reply other threads:[~2009-01-02 0:05 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 ` git-difftool Matthieu Moy
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 ` Markus Heidelberg [this message]
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=200901020104.01522.markus.heidelberg@web.de \
--to=markus.heidelberg@web$(echo .)de \
--cc=Matthieu.Moy@imag$(echo .)fr \
--cc=davvid@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=pkufranky@gmail$(echo .)com \
/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