Skip to content

Commit 2217230

Browse files
dschogitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 69986e1 commit 2217230

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

fmt-merge-msg.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,8 +626,10 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
626626
void *current_branch_to_free;
627627
struct merge_parents merge_parents;
628628

629-
if (!suppress_dest_pattern_seen)
629+
if (!suppress_dest_pattern_seen) {
630+
string_list_append(&suppress_dest_patterns, "main");
630631
string_list_append(&suppress_dest_patterns, "master");
632+
}
631633

632634
memset(&merge_parents, 0, sizeof(merge_parents));
633635

0 commit comments

Comments
 (0)