diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:48:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:48:20 -0700 |
| commit | 02ef0ed7102a197e2b746f3e694c09915fa98060 (patch) | |
| tree | 3e703ac528c01b7c964a0022185e14071cfb1c40 /builtin.h | |
| parent | 2851e8eba52e98d3112417952a24d82ae9d8c0eb (diff) | |
| parent | bd2549ca6b0b2d897e073bbaa34c1fee46acd8f0 (diff) | |
| download | git-02ef0ed7102a197e2b746f3e694c09915fa98060.tar.gz git-02ef0ed7102a197e2b746f3e694c09915fa98060.tar.xz | |
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.h | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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 { |