From: Junio C Hamano <junkio@cox.net>
Date: Mon, 10 Jul 2006 06:47:39 +0000 (-0700)
Subject: Merge branch 'ew/diff'
X-Git-Tag: v1.4.2-rc1~58
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fc93dbbfc91d5214b03101e057ba16f329763ef9;p=git.git

Merge branch 'ew/diff'

* ew/diff:
  templates/hooks--update: replace diffstat calls with git diff --stat
  diff: do not use configuration magic at the core-level
  Update diff-options and config documentation.
  diff.c: --no-color to defeat diff.color configuration.
  diff.c: respect diff.renames config option
---

fc93dbbfc91d5214b03101e057ba16f329763ef9
diff --cc builtin-log.c
index 0aeeaa4e2,dd5a5a2b1..7e5cab15c
--- a/builtin-log.c
+++ b/builtin-log.c
@@@ -105,10 -105,7 +105,10 @@@ static int git_format_config(const cha
  		strcat(extra_headers, value);
  		return 0;
  	}
 +	if (!strcmp(var, "diff.color")) {
 +		return 0;
 +	}
- 	return git_diff_config(var, value);
+ 	return git_diff_ui_config(var, value);
  }