git/fmt-merge-msg.h

#ifndef FMT_MERGE_MSG_H
#define FMT_MERGE_MSG_H

extern int merge_log_config;
int fmt_merge_msg_config(const char *key, const char *value, void *cb);

#endif /* FMT_MERGE_MSG_H */
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> 2011-10-07 06:12:09 +00:00			`#ifndef FMT_MERGE_MSG_H`
			`#define FMT_MERGE_MSG_H`

			`extern int merge_log_config;`
.[ch]: remove extern from function declarations using spatch There has been a push to remove extern from function declarations. Remove some instances of "extern" for function declarations which are caught by Coccinelle. Note that Coccinelle has some difficulty with processing functions with `__attribute__` or varargs so some `extern` declarations are left behind to be dealt with in a future patch. This was the Coccinelle patch used: @@ type T; identifier f; @@ - extern T f(...); and it was run with: $ git ls-files \.{c,h} \| grep -v ^compat/ \| xargs spatch --sp-file contrib/coccinelle/noextern.cocci --in-place Files under `compat/` are intentionally excluded as some are directly copied from external sources and we should avoid churning them as much as possible. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2019-04-29 08:28:14 +00:00			`int fmt_merge_msg_config(const char key, const char value, void *cb);`
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> 2011-10-07 06:12:09 +00:00
			`#endif /* FMT_MERGE_MSG_H */`