From 2217230d53ab6d3c6b61fc996a8394cbf8c7fce9 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 23 Oct 2020 13:59:58 +0000 Subject: fmt-merge-msg: also suppress "into main" by default In preparation for changing the default branch name to `main`, let's skip the suffix "into main" in merge commit messages, the same way that "into master" has been skipped by default. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c index bd22e1e..9a664a4 100644 --- a/fmt-merge-msg.c +++ b/fmt-merge-msg.c @@ -626,8 +626,10 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out, void *current_branch_to_free; struct merge_parents merge_parents; - if (!suppress_dest_pattern_seen) + if (!suppress_dest_pattern_seen) { + string_list_append(&suppress_dest_patterns, "main"); string_list_append(&suppress_dest_patterns, "master"); + } memset(&merge_parents, 0, sizeof(merge_parents)); -- cgit v0.10.2-6-g49f6