]> git.ipfire.org Git - thirdparty/git.git/blame - fmt-merge-msg.h
Merge branch 'rj/add-i-leak-fix'
[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;
bd2bc942 12 const char *into_name;
ce6521e4
DL
13};
14
898eacd8 15extern int merge_log_config;
a4e7e317
GC
16int fmt_merge_msg_config(const char *key, const char *value,
17 const struct config_context *ctx, void *cb);
ce6521e4
DL
18int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
19 struct fmt_merge_msg_opts *);
20
898eacd8
JH
21
22#endif /* FMT_MERGE_MSG_H */