From: David Aguilar <davvid@gmail.com>
To: Teemu Likonen <tlikonen@iki.fi>
Cc: "Kārlis Repsons" <karlis.repsons@gmail.com>, git@vger.kernel.org
Subject: Re: visualise the output of git-diff?
Date: Thu, 18 Jun 2009 22:47:31 -1000 [thread overview]
Message-ID: <20090619084731.GB46896@gmail.com> (raw)
In-Reply-To: <87r5xgpsnr.fsf@iki.fi>
On Fri, Jun 19, 2009 at 10:52:08AM +0300, Teemu Likonen wrote:
> On 2009-06-19 07:32 (UTC), Kārlis Repsons wrote:
>
> At least there is "git diff --color-words" but it may not be what you
> want.
>
> > And about pager - are you people all using less or there are also some
> > non-console viewers available?
>
> I mostly use "less" but sometimes also "kompare" which is excellent:
>
> git diff | kompare -
And of course.. don't forget about git-difftool =)
http://kernel.org/pub/software/scm/git/docs/git-difftool.html
$ git difftool -t kompare
$ git difftool -t diffuse
$ git difftool -t xxdiff
The quality of the visualization is only limited by the quality
of your difftool. We support lots of them. From the docs:
"Valid merge toosl are: kdiff3, kompare, tkdiff, meld,
xxdiff, emerge, vimdiff, gvimdiff, ecmerge, diffuse,
opendiff and araxis."
Like mergetool, difftool has an extension mechanism in case the
built-ins are not sufficient.
Have fun,
--
David
next prev parent reply other threads:[~2009-06-19 8:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-19 7:32 visualise the output of git-diff? Kārlis Repsons
2009-06-19 7:52 ` Teemu Likonen
2009-06-19 8:47 ` David Aguilar [this message]
2009-06-19 8:42 ` Wincent Colaiuta
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=20090619084731.GB46896@gmail.com \
--to=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=karlis.repsons@gmail.com \
--cc=tlikonen@iki.fi \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.