diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-07-09 23:47:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-09 23:47:39 -0700 |
| commit | fc93dbbfc91d5214b03101e057ba16f329763ef9 (patch) | |
| tree | 92f316a91500a941941fba6e97b00c1d00151080 /builtin-diff.c | |
| parent | e6ff54a261d72dd43c0755bae09a4970ec2620a1 (diff) | |
| parent | 3a895e0268537da731f5efe914ece5e7eac35ef3 (diff) | |
| download | git-fc93dbbfc91d5214b03101e057ba16f329763ef9.tar.gz | |
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-diff.c')
| -rw-r--r-- | builtin-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-diff.c b/builtin-diff.c index d520c7ca29..1df531ba28 100644 --- a/builtin-diff.c +++ b/builtin-diff.c @@ -250,7 +250,7 @@ int cmd_diff(int argc, const char **argv, char **envp) * Other cases are errors. */ - git_config(git_diff_config); + git_config(git_diff_ui_config); init_revisions(&rev); argc = setup_revisions(argc, argv, &rev, NULL); |