Merge branch 'cn/cherry-pick-range-docs' into maint

[git.git] / log-tree.h

diff --git a/log-tree.h b/log-tree.h
index 3f7b40027b7203985f018e43ab72a6cfc233e8d7..f5ac238bba478851bb10b09f32ea75da05475267 100644 (file)
--- a/log-tree.h
+++ b/log-tree.h
@@ -7,6 +7,7 @@ struct log_info {
        struct commit *commit, *parent;
 };
 
+int parse_decorate_color_config(const char *var, const int ofs, 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 *);
@@ -20,7 +21,7 @@ void log_write_email_headers(struct rev_info *opt, struct commit *commit,
 void load_ref_decorations(int flags);
 
 #define FORMAT_PATCH_NAME_MAX 64
-void get_patch_filename(struct commit *commit, int nr, const char *suffix,
-                       struct strbuf *buf);
+void get_patch_filename(struct commit *commit, const char *subject, int nr,
+                       const char *suffix, struct strbuf *buf);
 
 #endif