merge-recursive: introduce merge_options
[git/dscho.git] / log-tree.h
blob59ba4c48b7966db34c6345a445ab0b10e235ac83
1 #ifndef LOG_TREE_H
2 #define LOG_TREE_H
4 #include "revision.h"
6 struct log_info {
7 struct commit *commit, *parent;
8 };
10 void init_log_tree_opt(struct rev_info *);
11 int log_tree_diff_flush(struct rev_info *);
12 int log_tree_commit(struct rev_info *, struct commit *);
13 int log_tree_opt_parse(struct rev_info *, const char **, int);
14 void show_log(struct rev_info *opt);
15 void show_decorations(struct commit *commit);
16 void log_write_email_headers(struct rev_info *opt, const char *name,
17 const char **subject_p,
18 const char **extra_headers_p,
19 int *need_8bit_cte_p);
21 #endif