56

I need to diff two files (not two versions of the same file, they are however tracked by git, but that is unrelated) and I would like some colored output, how can I achieve that?

$ diff file_1 file_2

1,9d0
< <script ... >
<     // more code
< </script>

$

Above code shows me the difference between those files, however without any colors. For longer diffs that is hard to read.

Alternatively, is there a way for git (with which I do have nice color output) to diff two different files (not changes to a file)?

OSX (10.7.5)

miphe
  • 1,039

7 Answers7

62

When diffing files I almost always use vim:

vim -d file_1 file_2

It not only uses colours, it lines up the files so it's easier to see lines added/removed.

Philip Kearns
  • 1,104
53

Perl has a a lackluster colordiff wrapper for diff, but I prefer grc (generic colorizer).

With grc (generic colorizer), you can write your own wrappers for different types of commands or inputs (if you like that sort of thing).

Below, grc is running against /var/log/syslog (in the config, this file is set to a certain color scheme), where it highlights processes, pids, IPs and "connect"s.

Of course, it is recommended to use an alias so you don't forget:

alias diff="/usr/bin/grc /usr/bin/diff"

grc running against syslog

If you have git, you may just want to use that, which allows very robust diffing, even across branches. 

git diff master:cogs/foo.txt branch:widgets/bar.txt

You do not have to use git diff within a repository, you can use it for just regular files.enter image description here

git diff old.txt new.txt

As always, you can alias diff for ease of use.

alias diff="git diff"
jnovack
  • 1,486
12

To build on the approved answer: grc works great for this. It is installable with brew and colorizes a number of terminal commands out of the box, diff being one of them. So... 

brew install grc

...installs grc to your system. Then you need to set up your aliases, the brew caveat provides a solution. Simply add the following line to your .bashrc or similar.

source "`brew --prefix`/etc/grc.bashrc"

This will currently add the following aliases:

alias colourify="$GRC -es --colour=auto"
alias configure='colourify ./configure'
alias diff='colourify diff'
alias make='colourify make'
alias gcc='colourify gcc'
alias g++='colourify g++'
alias as='colourify as'
alias gas='colourify gas'
alias ld='colourify ld'
alias netstat='colourify netstat'
alias ping='colourify ping'
alias traceroute='colourify /usr/sbin/traceroute'
alias head='colourify head'
alias tail='colourify tail'
alias dig='colourify dig'
alias mount='colourify mount'
alias ps='colourify ps'
alias mtr='colourify mtr'
alias df='colourify df'
Mattias Bäcklund
  • 121
11

Homebrew has a formula for GNU diffutils, including a diff command with support for color.

$ brew install diffutils

$ /usr/local/bin/diff --color -r -c foo bar

color output

David Moles
  • 504
  • 2
  • 7
  • 21
9

You can get git to diff two different files:

git diff branch1:full/path/to/foo.txt branch2:full/path/to/foo-another.txt
Community
  • 1
Colin Pickard
  • 8,777
2

If you have Visual Studio Code (VS Code) installed and on your PATH, you can run code --diff file1 file2.

It provides a really nice side by side comparison with word diff, syntax highlighting, editing code while running the diffs, etc.

VS Code has an option to add itself to your PATH (uses a symlink actually) that you can find here.

Kevin Wheeler
  • 121
1
alias diff="git diff --no-index"
diff file_1 file_2
Dmitry Mottl
  • 111