mirror of
https://github.com/git/git.git
synced 2024-11-05 00:37:55 +01:00
898eacd8ad
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>
7 lines
187 B
C
7 lines
187 B
C
#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 */
|