Git diff side by side

How to get a side by side diff with git diff or git difftool in the terminal.

Alternative 1

Use icdiff, as instructed on

  1. install icdiff (from jeffkaufman/icdiff but ubuntu also has a package)
  2. add to your ~/.gitconfig:
      tool = icdiff
      prompt = false
    [difftool "icdiff"]
      cmd = /usr/local/bin/icdiff --line-numbers $LOCAL $REMOTE
  1. use git difftool ... to use instead of git diff, e.g. git difftool master to compare current branch and master.

Example output:

Example screen shot

Alternative 2


  • sdiff (from diffutils)
  • colordiff

Place the following in your PATH (eg ~/bin/diffy):

echo Comparing: "$1 between $3 and $6"
if stty >/dev/null 2>&1; then
  pager=${PAGER:-less -r}
C=$(stty size | cut -d' ' -f2)
D=$(expr $C / 2)
sdiff -W -w $C "$2" "$5" | colordiff | grep -E "^.{$D} *[|<>] *" -A 10 -B 10 -n | $pager

Then set the environment variable GIT_EXTERNAL_DIFF to point to it.

Example output: Example screen shot

Copyright (C) Cockroach Labs.
Attention: This documentation is provided on an "as is" basis, without warranties or conditions of any kind, either express or implied, including, without limitation, any warranties or conditions of title, non-infringement, merchantability, or fitness for a particular purpose.