Merge branch 'mv/sequencer-pick-error-diag'

diff --git a/log-tree.h b/log-tree.h
index 9140f48216be10085c9a1aea7ef1d210817c3332..d6ecd4dc46b82147c5c7e00dcfa2e9088ab00d7c 100644 (file)
--- a/log-tree.h
+++ b/log-tree.h
@@ -13,6 +13,7 @@ int log_tree_diff_flush(struct rev_info *);
 int log_tree_commit(struct rev_info *, struct commit *);
 int log_tree_opt_parse(struct rev_info *, const char **, int);
 void show_log(struct rev_info *opt);
+void format_decorations(struct strbuf *sb, const struct commit *commit, int use_color);
 void show_decorations(struct rev_info *opt, struct commit *commit);
 void log_write_email_headers(struct rev_info *opt, struct commit *commit,
                             const char **subject_p,