git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: enso <a.calhoon@gmail.com>
To: git@vger.kernel.org
Subject: Re: git-difftool
Date: Fri, 16 Jan 2009 19:47:20 -0800 (PST)	[thread overview]
Message-ID: <1232164040173-2171934.post@n2.nabble.com> (raw)
In-Reply-To: <46dff0320901011759ke7026d9hafe4fdde099e370b@mail.gmail.com>




Ping Yin wrote:
> 
> Thanks. With GIT_PAGER="" it works now.
> 

Personally, I didn't like having to screw around with environment variables
directly to get vimdiff to work. So I did the following:

1) Made a simple diff script gitvimdiff.sh:

#!/bin/env sh
vimdiff "$2" "$5"

2) git config --global diff.external ~/path/to/gitvimdiff.sh
3) git config --global pager.diff ""

Now when I run git-diff it uses vimdiff (hooray) and automatically turns the
pager off for me! Now only if I could get meld to work under cygwin.
-- 
View this message in context: http://n2.nabble.com/git-difftool-tp1814817p2171934.html
Sent from the git mailing list archive at Nabble.com.

  reply	other threads:[~2009-01-17  3:49 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     ` git-difftool Markus Heidelberg
2009-01-02  1:59       ` git-difftool Ping Yin
2009-01-17  3:47         ` enso [this message]
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=1232164040173-2171934.post@n2.nabble.com \
    --to=a.calhoon@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).