summaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-11-04 17:35:42 -0700
committerJunio C Hamano <gitster@pobox.com>2011-11-07 15:34:30 -0800
commitcbda121c993bf14d3743c7fdf0f8c476c9f7c636 (patch)
treed9b680be1d56696b9bab53fb665ff04ae73dea00 /builtin.h
parent4c0ea82da3cd35eff50377cab78208c8ef57933b (diff)
downloadgit-cbda121c993bf14d3743c7fdf0f8c476c9f7c636.tar.gz
fmt-merge-msg: package options into a structure
This way new features can be added more easily Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin.h')
-rw-r--r--builtin.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/builtin.h b/builtin.h
index 0e9da90834..e94a5dc8a5 100644
--- a/builtin.h
+++ b/builtin.h
@@ -14,8 +14,14 @@ extern const char git_usage_string[];
extern const char git_more_info_string[];
extern void prune_packed_objects(int);
+
+struct fmt_merge_msg_opts {
+ unsigned add_title:1;
+ int shortlog_len;
+};
+
extern int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
- int merge_title, int shortlog_len);
+ struct fmt_merge_msg_opts *);
extern void commit_notes(struct notes_tree *t, const char *msg);
struct notes_rewrite_cfg {