Revision c5a8f1efc03746fd6b6c71fef8e3a5c38ce4e2e8 authored by Junio C Hamano on 29 September 2020, 21:01:19 UTC, committed by Junio C Hamano on 29 September 2020, 21:01:20 UTC
More FAQ entries. * bc/faq-misc: docs: explain how to deal with files that are always modified docs: explain why reverts are not always applied on merge docs: explain why squash merges are broken with long-running branches
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;
};
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 */
Computing file changes ...
