Merge branch 'jc/diff-relative'

* jc/diff-relative: diff --relative: help working in a bare repository diff --relative: output paths as relative to the current subdirectory