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 /diff.h | |
| parent | Merge branch 'ew/svn' (diff) | |
| parent | templates/hooks--update: replace diffstat calls with git diff --stat (diff) | |
| download | tgif-fc93dbbfc91d5214b03101e057ba16f329763ef9.tar.xz | |
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 'diff.h')
| -rw-r--r-- | diff.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -123,7 +123,7 @@ extern int diff_scoreopt_parse(const char *opt); #define DIFF_SETUP_USE_CACHE 2 #define DIFF_SETUP_USE_SIZE_CACHE 4 -extern int git_diff_config(const char *var, const char *value); +extern int git_diff_ui_config(const char *var, const char *value); extern void diff_setup(struct diff_options *); extern int diff_opt_parse(struct diff_options *, const char **, int); extern int diff_setup_done(struct diff_options *); |