From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Feb 2008 19:55:28 +0000 (-0800)
Subject: Merge branch 'jc/diff-relative'
X-Git-Tag: v1.5.5-rc0~139
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=860cc3a4f9c3ac21fcd37bbe30f40ab073f01299;p=git.git

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
---

860cc3a4f9c3ac21fcd37bbe30f40ab073f01299
diff --cc diff.h
index c5d3a4f96,fcd965382..9a652e7f3
--- a/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;