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

diff --cc builtin-log.c
index 0aeeaa4e20ceaaad32707749b0aed03bd390c46a,dd5a5a2b14abcd225c96338994952c1b4c4dffdf..7e5cab15c106f59417804a25d094c94e78d64063
--- 1/builtin-log.c
--- 2/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;
        }
-       return git_diff_config(var, value);
 +      if (!strcmp(var, "diff.color")) {
 +              return 0;
 +      }
+       return git_diff_ui_config(var, value);
  }
  
  

diff --cc diff.c
Simple merge