diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-18 11:16:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-18 11:16:54 -0700 |
| commit | 8642abc76454a6e09344e27a7797ff08264abe76 (patch) | |
| tree | dcdc99515cb5e53795b7777b85b8030fd1f9fbb4 /builtin.h | |
| parent | fd8b005c0d5bcc91c3b5a883f72addc0e51fb38b (diff) | |
| parent | f0ecac2b70bf6b44b89dfa493abd2f544010b1eb (diff) | |
| download | git-8642abc76454a6e09344e27a7797ff08264abe76.tar.gz | |
Merge branch 'tc/merge-m-log'
* tc/merge-m-log:
merge: --log appends shortlog to message if specified
fmt-merge-msg: add function to append shortlog only
fmt-merge-msg: refactor merge title formatting
fmt-merge-msg: minor refactor of fmt_merge_msg()
merge: rename variable
merge: update comment
t7604-merge-custom-message: show that --log doesn't append to -m
t7604-merge-custom-message: shift expected output creation
Conflicts:
builtin.h
Diffstat (limited to 'builtin.h')
| -rw-r--r-- | builtin.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -16,6 +16,7 @@ extern const char *help_unknown_cmd(const char *cmd); 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 commit_notes(struct notes_tree *t, const char *msg); struct notes_rewrite_cfg { |