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

diff --cc builtin-diff.c
Simple merge

diff --cc diff.c
Simple merge

diff --cc diff.h
index c5d3a4f965380fd56791fc99864fa27b758da7ca,fcd9653822effd07c0ebb34b4f2c65e55ebf5d2e..9a652e7f38e3c1aeb7c7eaf840dea7bcea285311
--- 1/diff.h
--- 2/diff.h
+++ b/diff.h
@@@ -82,9 -81,10 +83,11 @@@ struct diff_options 
        int pickaxe_opts;
        int rename_score;
        int rename_limit;
 +      int dirstat_percent;
        int setup;
        int abbrev;
+       const char *prefix;
+       int prefix_length;
        const char *msg_sep;
        const char *stat_sep;
        long xdl_opts;

diff --cc revision.c
Simple merge