diff options
Diffstat (limited to 'fmt-merge-msg.c')
| -rw-r--r-- | fmt-merge-msg.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c index abc3403fb8..46f6015c44 100644 --- a/fmt-merge-msg.c +++ b/fmt-merge-msg.c @@ -627,8 +627,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)); |