diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-10-23 13:59:58 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-10-23 08:57:39 -0700 |
| commit | 2217230d53ab6d3c6b61fc996a8394cbf8c7fce9 (patch) | |
| tree | 202f9f15646fafbbebc8fe709dc82d5e6b8b7bef | |
| parent | Git 2.29 (diff) | |
| download | tgif-2217230d53ab6d3c6b61fc996a8394cbf8c7fce9.tar.xz | |
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 <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 bd22e1ea88..9a664a4a58 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)); |