summaryrefslogtreecommitdiff
path: root/color.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-22 00:50:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-01-22 00:50:34 (GMT)
commit35e6afd4c6bc73cba7bc279ff43b498389bf805a (patch)
tree9fb4d4137ada34fa48e2424ce56b52879a637611 /color.h
parenta14f15427bca9af70127f26cd3cb0fcd78c8d36f (diff)
parent2c2dc7c82cea66c5030583233c73593e0f5a8fdb (diff)
downloadgit-35e6afd4c6bc73cba7bc279ff43b498389bf805a.zip
git-35e6afd4c6bc73cba7bc279ff43b498389bf805a.tar.gz
git-35e6afd4c6bc73cba7bc279ff43b498389bf805a.tar.bz2
Merge branch 'jk/color-parse'
* jk/color-parse: Optimize color_parse_mem expand --pretty=format color options color: make it easier for non-config to parse color specs
Diffstat (limited to 'color.h')
-rw-r--r--color.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/color.h b/color.h
index 6cf5c88..7066099 100644
--- a/color.h
+++ b/color.h
@@ -16,7 +16,8 @@ extern int git_use_color_default;
int git_color_default_config(const char *var, const char *value, void *cb);
int git_config_colorbool(const char *var, const char *value, int stdout_is_tty);
-void color_parse(const char *var, const char *value, char *dst);
+void color_parse(const char *value, const char *var, char *dst);
+void color_parse_mem(const char *value, int len, const char *var, char *dst);
int color_fprintf(FILE *fp, const char *color, const char *fmt, ...);
int color_fprintf_ln(FILE *fp, const char *color, const char *fmt, ...);