]> git.ipfire.org Git - thirdparty/git.git/blame - fmt-merge-msg.h
Merge branch 'jt/t5500-unflake'
[thirdparty/git.git] / fmt-merge-msg.h
CommitLineData
898eacd8
JH
1#ifndef FMT_MERGE_MSG_H
2#define FMT_MERGE_MSG_H
3
ce6521e4
DL
4#include "strbuf.h"
5
6#define DEFAULT_MERGE_LOG_LEN 20
7
8struct fmt_merge_msg_opts {
9 unsigned add_title:1,
10 credit_people:1;
11 int shortlog_len;
12};
13
898eacd8 14extern int merge_log_config;
55454427 15int fmt_merge_msg_config(const char *key, const char *value, void *cb);
ce6521e4
DL
16int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
17 struct fmt_merge_msg_opts *);
18
898eacd8
JH
19
20#endif /* FMT_MERGE_MSG_H */