Merge branch 'en/merge-rename-rename-worktree-fix'

[thirdparty/git.git] / fmt-merge-msg.h

diff --git a/fmt-merge-msg.h b/fmt-merge-msg.h
index 01e3aa88c50c1994065a99515bd13f484558b553..f2ab0e0085ada6509c02427503b1ea04b18951e0 100644 (file)
--- a/fmt-merge-msg.h
+++ b/fmt-merge-msg.h
@@ -1,7 +1,20 @@
 #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 */