Skip to main content

bash Colourful side by side command line diff


I have never liked default linux diff command. The more changes you make, the less informative it becomes. When you work with git it would be nice to have side-by-side comparison of original file and a new file with changes. Graphical tools like smartgit and meld do it really impressive.

But sometimes it is more comfortable to use command line tools. For colourful side-by-side git diff you can use cdiff. The simpliest way to install it is with pip package manager:
pip install cdiff

Then in your repository run:
cdiff -s

And the result is gorgeous!

The next tool is called icdiff. It does basicly the same, but with files. Install it with that command:
curl -s https://raw.githubusercontent.com/jeffkaufman/icdiff/release-1.2.0/icdiff 
| sudo tee /usr/local/bin/icdiff > /dev/null
&& sudo chmod ugo+rx /usr/local/bin/icdiff


Use it like this:
icdiff file1 file2

Popular posts from this blog

Baixar PS1 Crash Bandicoot 2 Cortex Strikes Back

PARTE 1: http://www.megaupload.com/?d=1AVO7X8T PARTE 2: http://www.megaupload.com/?d=WUBY6EAH

Barbarian Level 70 Paragon Level 191

Ive been thoroughly enjoying Reaper of Souls, so much so that Ive skipped posting here for some time (sorry, guys) and just concentrated on leveling-up my barbarian character. As you can see from the screenshot below, Ive been spending quite some time transmogrifying and buying up dyes making sure everythings coordinated and shit. Right now my barbarian is the most powerful (i.e., the one able to dish out the most damage) among my characters but I have a feeling that my crusader is going to overtake him really fast (at least until he levels up to 70 - just 2 more levels to go). Also, hes the sugar daddy of the bunch, the one tasked to make the most money for spending by the group. Ive given him some rest in the last couple of weeks however, preferring to adventure with my crusader and exploring his different abilities. Ill be getting him back on track soon enough though as the barbarian is my favorite class. Im currently playing at Torment II but I hope to progress to Torment III as so...

Baixar Filme Download Quadrilogia Veloses e Furiosos – Dublado

Sinopse : Eles t�m muita adrenalina e m�quinas poderosas, mas acima de tudo, eles possuem a extrema necessidade de velocidade. Nas ruas de Los Angeles, toda noite Dominic Toretto (Vin Diesel) transforma seus desafiantes em p�. Mas agora, h� um novo furor nas ruas. Eles sabem que ele � dur�o e r�pido, mas o que n�o sabem � que ele � um detetive determinado e veloz (Paul Walker). Com intensa a��o e velocidade, espantosas acrobacias e com o p� fundo no acelerador, este ataque furioso o colocar� no banco do motorista e o desafiar� a exceder os seus limites. Lan�amento : 2001 a 2008 Dura��o : 100 min apx. Cada Qualidade : DVDRip �udio : 10 V�deo : 10 Formato : RMVB Tamanho : 350 Mb apx. Cada �dioma : Portugu�s Veloses e Furiosos 1 >> Megaupload Veloses e Furiosos 2 >> Megaupload Veloses e Furiosos 3 >> Megaupload Veloses e Furiosos 4 >> Megaupload