SEARCH
NEW RPMS
DIRECTORIES
ABOUT
FAQ
VARIOUS
BLOG
DONATE


YUM REPOSITORY

 
 

MAN page from OpenSuSE colordiff-1.0.9-1.1.noarch.rpm

COLORDIFF

Section: (1)
Updated: 01/25/2009
Index 

NAME

colordiff - a tool to colorize diff output 

SYNOPSIS

colordiff [diff options] [colordiff options] {file1} {file2}
 

DESCRIPTION

colordiffis a wrapper fordiffand produces the same output asdiffbut with coloured syntax highlighting at the command line to improve readability. The output is similar to how adiff-generated patch might appear inVimorEmacswith the appropriate syntax highlighting options enabled. The colour schemes can be read from a central configuration file or from a local user~/.colordiffrcfile.

colordiffmakes use of ANSI colours and as such will only work when ANSI colours can be used - typical examples are xterms and Eterms, as well as console sessions.

colordiffhas been tested on various flavours of Linux and under OpenBSD, but should be broadly portable to other systems. 

USAGE

Usecolordiffwherever you would normally usediff, or pipe output tocolordiff:

For example:

$ colordiff file1 file2$ diff -u file1 file2 | colordiff

You can pipe the output to 'less', using the '-R' option (some systems or terminal types may get better results using '-r' instead), which keeps the colour escape sequences, otherwise displayed incorrectly or discarded by 'less':

$ diff -u file1 file2 | colordiff | less -R

If you havewdiffinstalled, colordiff will correctly colourise the added and removed text, provided that the '-n' option is given towdiff:

$ wdiff -n file1 file2 | colordiff

You may find it useful to makediffautomatically callcolordiff. Add the following line to~/.bashrc(or equivalent):

alias diff=colordiff

Any options passed tocolordiffare passed through todiffexcept for the colordiff-specific option 'difftype', e.g.

colordiff --difftype=debdiff file1 file2

Valid values for 'difftype' are: diff, diffc, diffu, diffy, wdiff, debdiff; these correspond to plain diffs, context diffs, unified diffs, side-by-side diffs, wdiff output and debdiff output respectively. Use these overrides when colordiff is not able to determine the diff-type automatically.

Alternatively, a construct such as 'cvs diff SOMETHING | colordiff' can be included in~/.bashrcas follows:

function cvsdiff () { cvs diff $@ | colordiff; }

Or, combining the idea above using 'less':

function cvsdiff () { cvs diff $@ | colordiff |less -R; }

Note that the function name, cvsdiff, can be customized. 

FILES

/etc/colordiffrc

Central configuration file. User-specific settings can be enabled by copying this file to~/.colordiffrcand making the appropriate changes.

colordiffrc-lightbg

Alternate configuration template for use with terminals having light backgrounds. Copy this to /etc/colordiffrc or ~/.colordiffrc and customize.
 

BUGS

Bug reports and suggestions/patches to<daveeAATTsungate.co.uk>please. 

AUTHOR

colordiffis written and maintained by Dave Ewart<daveeAATTsungate.co.uk>. This manual page and the source XML was written by Graham Wilson<grahamAATTmknod.org>for Debian and is maintained by the author. Dave Ewart maintains the Debian package, sponsored by Graham Wilson.


 

Index

NAME
SYNOPSIS
DESCRIPTION
USAGE
FILES
BUGS
AUTHOR

This document was created byman2html,using the manual pages.