rebase -m: do not trigger pre-commit verification

diff --git a/log-tree.h b/log-tree.h
index a26e4841ff9f568f8536f286e3fc40f09b9dff3b..b33f7cd7ac2ef6a2587109c4ee618d63ccedae96 100644 (file)
--- a/log-tree.h
+++ b/log-tree.h
@@ -11,6 +11,7 @@ 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);
+void show_decorations(struct commit *commit);
 
 #endif