From: David Aguilar Date: Fri, 19 Jun 2009 08:47:31 GMT Subject: Re: visualise the output of git-diff? Message-ID: <20090619084731.GB46896@gmail.com> 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