fmt-merge-msg: use branch.$name.description

This teaches "merge --log" and fmt-merge-msg to use branch description
information when merging a local topic branch into the mainline. The
description goes between the branch name label and the list of commit
titles.

The refactoring to share the common configuration parsing between
merge and fmt-merge-msg needs to be made into a separate patch.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2011-10-06 23:12:09 -07:00
parent c016814783
commit 898eacd8ad
5 changed files with 78 additions and 26 deletions

7
fmt-merge-msg.h Normal file
View File

@ -0,0 +1,7 @@
#ifndef FMT_MERGE_MSG_H
#define FMT_MERGE_MSG_H
extern int merge_log_config;
extern int fmt_merge_msg_config(const char *key, const char *value, void *cb);
#endif /* FMT_MERGE_MSG_H */