Re: visualise the output of git-diff?

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]