Merge branch 'so/log-diff-merge'

[thirdparty/git.git] / fmt-merge-msg.c

diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
index abc3403fb820152d994675c2e388f35b5d7e4bfa..46f6015c447dad5d2a6768bf92274cf728725846 100644 (file)
--- 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));