Merge branches 'lh/submodules' and 'pb/am'

diff --git a/log-tree.h b/log-tree.h
index 91a909be73130b8542ed9092e120084bb263105b..e82b56a20d3cfad318a4af6ea78fbe098653211d 100644 (file)
--- a/log-tree.h
+++ b/log-tree.h
@@ -3,9 +3,14 @@
 
 #include "revision.h"
 
+struct log_info {
+       struct commit *commit, *parent;
+};
+
 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, const char *sep);
 
 #endif