Skip to main content

Browse the archive

https://github.com/git/git
05 April 2024, 19:32:26 UTC
Revision ab1f2765f78e75ee51dface57e1071b3b7f42b09 authored by Junio C Hamano on 08 April 2022, 20:54:49 UTC, committed by Junio C Hamano on 08 April 2022, 20:54:49 UTC 
Git 2.36-rc1
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent e7109d5
Raw File
Tip revision: ab1f2765f78e75ee51dface57e1071b3b7f42b09 authored by Junio C Hamano on 08 April 2022, 20:54:49 UTC
Git 2.36-rc1
Tip revision: ab1f276
fmt-merge-msg.h 
#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, void *cb);
int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
		  struct fmt_merge_msg_opts *);


#endif /* FMT_MERGE_MSG_H */
back to top