From: Johannes Schindelin <johannes.schindelin@xxxxxx>
In preparation for changing the default branch name to `main`, let's
skip the suffix "into main" in merge commit messages.
Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
---
fmt-merge-msg.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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));
--
gitgitgadget
