contrib: add 'git difftool' for launching common merge tools

diff --git a/log-tree.h b/log-tree.h
index 59ba4c48b7966db34c6345a445ab0b10e235ac83..f2a90084ae1874632318c7880e95426eca2682ea 100644 (file)
--- a/log-tree.h
+++ b/log-tree.h
@@ -12,10 +12,11 @@ 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 show_decorations(struct commit *commit);
+void show_decorations(struct rev_info *opt, struct commit *commit);
 void log_write_email_headers(struct rev_info *opt, const char *name,
                             const char **subject_p,
                             const char **extra_headers_p,
                             int *need_8bit_cte_p);
+void load_ref_decorations(void);
 
 #endif