Staging
v0.5.0
v0.5.0
Revision 297ca895a27a6bbdb7906371d533f72a12ad25b2 authored by Junio C Hamano on 20 January 2022, 23:25:38 UTC, committed by Junio C Hamano on 20 January 2022, 23:25:38 UTC
"git branch -h" incorrectly said "--track[=direct|inherit]", implying that "--trackinherit" is a valid option, which has been corrected. source: <3de40324bea6a1dd9bca2654721471e3809e87d8.1642538935.git.steadmon@google.com> source: <c3c26192-aee9-185a-e559-b8735139e49c@web.de> * js/branch-track-inherit: branch,checkout: fix --track documentation
fmt-merge-msg.h
#ifndef FMT_MERGE_MSG_H
#define FMT_MERGE_MSG_H
#include "strbuf.h"
#define DEFAULT_MERGE_LOG_LEN 20
struct fmt_merge_msg_opts {
unsigned add_title:1,
credit_people:1;
int shortlog_len;
const char *into_name;
};
extern int merge_log_config;
int fmt_merge_msg_config(const char *key, const char *value, void *cb);
int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
struct fmt_merge_msg_opts *);
#endif /* FMT_MERGE_MSG_H */
Computing file changes ...