summaryrefslogtreecommitdiff
path: root/log-tree.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-20 12:23:48 -0700
committerJunio C Hamano <gitster@pobox.com>2014-10-20 12:23:48 -0700
commitb94657683996402228abb1694a5db4792c424f9e (patch)
treea553b8703be639bf1af8c74946337a5ebe08529f /log-tree.h
parentb67588d018441d1485378a7d9b460401ba8b76a5 (diff)
parentf6c5a2968c103621adf6928a29e4895361eaa23b (diff)
downloadgit-b94657683996402228abb1694a5db4792c424f9e.tar.gz
Merge branch 'jn/parse-config-slot'
Code cleanup. * jn/parse-config-slot: color_parse: do not mention variable name in error message pass config slots as pointers instead of offsets
Diffstat (limited to 'log-tree.h')
-rw-r--r--log-tree.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/log-tree.h b/log-tree.h
index b26160c4d6..c8116e60cd 100644
--- a/log-tree.h
+++ b/log-tree.h
@@ -7,7 +7,7 @@ struct log_info {
struct commit *commit, *parent;
};
-int parse_decorate_color_config(const char *var, const int ofs, const char *value);
+int parse_decorate_color_config(const char *var, const char *slot_name, const char *value);
void init_log_tree_opt(struct rev_info *);
int log_tree_diff_flush(struct rev_info *);
int log_tree_commit(struct rev_info *, struct commit *);