diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-20 16:13:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-20 16:13:56 -0800 |
| commit | b23b27eb5dc950081d4f76ae84f10168c4d149bd (patch) | |
| tree | 6e29309bd8f2ae4b200214a0d2257aa1bc909515 /diff.h | |
| parent | 6fe870f032e4a247cdcf2949bb24d103873ff597 (diff) | |
| parent | 6b2f2d9805dd22c6f74957e0d76a1d2921b40c16 (diff) | |
| download | git-b23b27eb5dc950081d4f76ae84f10168c4d149bd.tar.gz | |
Merge branch 'mk/color'
* mk/color:
Add color.ui variable which globally enables colorization if set
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -174,6 +174,7 @@ extern void diff_unmerge(struct diff_options *, extern int git_diff_basic_config(const char *var, const char *value); extern int git_diff_ui_config(const char *var, const char *value); +extern int diff_use_color_default; 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 *); |