Re: [PATCH 01/10] fmt-merge-msg: also suppress "into main" by default

> "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
> writes:
>
> > From: Johannes Schindelin <johannes.schindelin@gmx.de>
> >
> > In preparation for changing the default branch name to `main`, let's
> > skip the suffix "into main" in merge commit messages.
>
> Hmph, we reversed the course from "no suppression" to "suppress
> master as we've always done" because otherwise we'd add _more_
> instances of 6-letter string 'master' to our codebase, and that
> was to be avoided.  There is no such "let's avoid saying main"
> desire, is there?
>
> I can see why a series about updating tests would want a change like
> this (i.e. to avoid patches that have to add 'into main' everywhere
> to the expected output), but as to the desired behaviour of the
> default behaviour of "git merge" command, I am not sure this goes
> into the right direction.  After all, there are those (including me)
> who find the idea of having one single thing (in this case a branch)
> that is special among others is objectionable in itself, not what
> word (e.g. 'master') is used to call that single "special" thing.

> Having said all that, let me keep my suggested change to the very
> minimum.  Let's end the proposed log message with
>
>     ..., let's skip the suffix "into main" in merge commit messages,
>     the same way that "into master" has been skipped by default.
>
> That would justify why we are still special casing the new word.