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

Labels:

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
Read more

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...
Read more

Baixar Jogo Download Mario Kart Double Dash Emulador de NGC PC

Na nova vers�o os gr�ficos ficaram bel�ssimos, o som simplesmente cativante, as musicas de cada cenario fasem a diferen�a na hora de jogar e embalam as corridas. A jogabilidade nem se fala, a possibilidade de fazer Dash (derrapada ou Drift) para ganhar velocidade � essencial para vencer, e ainda tem o fato de que jogamos com dois personagens em cada Kart, ou seja, podemos combinar Mario dirigido e Bowser atrapalhando os adversarios e no meio da corrida basta um toque no bot�o Z e eles mudam de posi��o. Cada dupla de personagem tem seu poder especial, Mario e Luigi tem bolas de foto, Koopa e Paratroopa tem cascos triplos, Bowser e seu filinho podem lan�ar cascos enormes e por ai vai. S�o varios personagens mais 2 destravaveis, os carros ent�o nem se fala, � um mais legal que outro cada um com seu diferencial. Sem d�vida nenhuma Mario Kart Double Dash � um marco para a hist�ria dos games e vale a pena jogar por muitas horas. :::Minima::: Core 2 Duo 8800 GT 1Gb de RAM :::Recomendada ...
Read more