Merge branch 'jc/diff'

* jc/diff:
  diff --color: use $GIT_DIR/config

diff --cc diff.c
Simple merge