Merge branch 'ew/diff'
authorJunio C Hamano <junkio@cox.net>
Mon, 10 Jul 2006 06:47:39 +0000 (23:47 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 10 Jul 2006 06:47:39 +0000 (23:47 -0700)
* 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

No differences found