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

1  2 
builtin-log.c
diff.c

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