summaryrefslogtreecommitdiff
path: root/builtin-log.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-10 06:47:39 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-10 06:47:39 (GMT)
commitfc93dbbfc91d5214b03101e057ba16f329763ef9 (patch)
tree92f316a91500a941941fba6e97b00c1d00151080 /builtin-log.c
parente6ff54a261d72dd43c0755bae09a4970ec2620a1 (diff)
parent3a895e0268537da731f5efe914ece5e7eac35ef3 (diff)
downloadgit-fc93dbbfc91d5214b03101e057ba16f329763ef9.zip
git-fc93dbbfc91d5214b03101e057ba16f329763ef9.tar.gz
git-fc93dbbfc91d5214b03101e057ba16f329763ef9.tar.bz2
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
Diffstat (limited to 'builtin-log.c')
-rw-r--r--builtin-log.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin-log.c b/builtin-log.c
index 0aeeaa4..7e5cab1 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -47,7 +47,7 @@ int cmd_whatchanged(int argc, const char **argv, char **envp)
{
struct rev_info rev;
- git_config(git_diff_config);
+ git_config(git_diff_ui_config);
init_revisions(&rev);
rev.diff = 1;
rev.diffopt.recursive = 1;
@@ -62,7 +62,7 @@ int cmd_show(int argc, const char **argv, char **envp)
{
struct rev_info rev;
- git_config(git_diff_config);
+ git_config(git_diff_ui_config);
init_revisions(&rev);
rev.diff = 1;
rev.diffopt.recursive = 1;
@@ -79,7 +79,7 @@ int cmd_log(int argc, const char **argv, char **envp)
{
struct rev_info rev;
- git_config(git_diff_config);
+ git_config(git_diff_ui_config);
init_revisions(&rev);
rev.always_show_header = 1;
cmd_log_init(argc, argv, envp, &rev);
@@ -108,7 +108,7 @@ static int git_format_config(const char *var, const char *value)
if (!strcmp(var, "diff.color")) {
return 0;
}
- return git_diff_config(var, value);
+ return git_diff_ui_config(var, value);
}