Adding upstream version 1:2.47.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
This commit is contained in:
parent
fd5a0bafa2
commit
54102a2c29
4535 changed files with 1510258 additions and 0 deletions
22
fmt-merge-msg.h
Normal file
22
fmt-merge-msg.h
Normal file
|
@ -0,0 +1,22 @@
|
|||
#ifndef FMT_MERGE_MSG_H
|
||||
#define FMT_MERGE_MSG_H
|
||||
|
||||
#include "strbuf.h"
|
||||
|
||||
#define DEFAULT_MERGE_LOG_LEN 20
|
||||
|
||||
struct fmt_merge_msg_opts {
|
||||
unsigned add_title:1,
|
||||
credit_people:1;
|
||||
int shortlog_len;
|
||||
const char *into_name;
|
||||
};
|
||||
|
||||
extern int merge_log_config;
|
||||
int fmt_merge_msg_config(const char *key, const char *value,
|
||||
const struct config_context *ctx, void *cb);
|
||||
int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
|
||||
struct fmt_merge_msg_opts *);
|
||||
|
||||
|
||||
#endif /* FMT_MERGE_MSG_H */
|
Loading…
Add table
Add a link
Reference in a new issue