Merge branch 'jc/apply'

diff --git a/log-tree.h b/log-tree.h
index a26e4841ff9f568f8536f286e3fc40f09b9dff3b..e82b56a20d3cfad318a4af6ea78fbe098653211d 100644 (file)
--- a/log-tree.h
+++ b/log-tree.h
@@ -11,6 +11,6 @@ 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 *);
 int log_tree_opt_parse(struct rev_info *, const char **, int);
-void show_log(struct rev_info *opt, struct log_info *log, const char *sep);
+void show_log(struct rev_info *opt, const char *sep);
 
 #endif