Merge branch 'ba/object-info' into maint
[git.git] / fmt-merge-msg.h
blobf2ab0e0085ada6509c02427503b1ea04b18951e0
1 #ifndef FMT_MERGE_MSG_H
2 #define FMT_MERGE_MSG_H
4 #include "strbuf.h"
6 #define DEFAULT_MERGE_LOG_LEN 20
8 struct fmt_merge_msg_opts {
9 unsigned add_title:1,
10 credit_people:1;
11 int shortlog_len;
14 extern int merge_log_config;
15 int fmt_merge_msg_config(const char *key, const char *value, void *cb);
16 int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
17 struct fmt_merge_msg_opts *);
20 #endif /* FMT_MERGE_MSG_H */