summaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-29 20:48:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-09-29 20:48:20 (GMT)
commit02ef0ed7102a197e2b746f3e694c09915fa98060 (patch)
tree3e703ac528c01b7c964a0022185e14071cfb1c40 /builtin.h
parent2851e8eba52e98d3112417952a24d82ae9d8c0eb (diff)
parentbd2549ca6b0b2d897e073bbaa34c1fee46acd8f0 (diff)
downloadgit-02ef0ed7102a197e2b746f3e694c09915fa98060.zip
git-02ef0ed7102a197e2b746f3e694c09915fa98060.tar.gz
git-02ef0ed7102a197e2b746f3e694c09915fa98060.tar.bz2
Merge branch 'rr/fmt-merge-msg'
* rr/fmt-merge-msg: t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length t6200-fmt-merge-msg: Exercise 'merge.log' to configure shortlog length merge: Make 'merge.log' an integer or boolean option merge: Make '--log' an integer option for number of shortlog entries fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len Conflicts: builtin/merge.c
Diffstat (limited to 'builtin.h')
-rw-r--r--builtin.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/builtin.h b/builtin.h
index 0398d24..f2a25a0 100644
--- a/builtin.h
+++ b/builtin.h
@@ -7,14 +7,15 @@
#include "commit.h"
#include "notes.h"
+#define DEFAULT_MERGE_LOG_LEN 20
+
extern const char git_version_string[];
extern const char git_usage_string[];
extern const char git_more_info_string[];
extern void prune_packed_objects(int);
-extern int fmt_merge_msg(int merge_summary, struct strbuf *in,
- struct strbuf *out);
-extern int fmt_merge_msg_shortlog(struct strbuf *in, struct strbuf *out);
+extern int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
+ int merge_title, int shortlog_len);
extern int commit_notes(struct notes_tree *t, const char *msg);
struct notes_rewrite_cfg {