about summary refs log tree commit diff
path: root/third_party/git/fmt-merge-msg.h
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/fmt-merge-msg.h')
-rw-r--r--third_party/git/fmt-merge-msg.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/third_party/git/fmt-merge-msg.h b/third_party/git/fmt-merge-msg.h
index 01e3aa88c50c..f2ab0e0085ad 100644
--- a/third_party/git/fmt-merge-msg.h
+++ b/third_party/git/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 */