Re: Bug report

From: Alastair Douglas <alastair.douglas@gmail.com>
Date: Oct 4, 2022, 10:15 UTC
Message-ID: <CADTs3HFZjX7P=n3PpjAtt=6E9m3PUgFKXksZKuOY4t71hSSnrw@mail.gmail.com>
In-Reply-To: <xmqqill0voft.fsf@gitster.g>

On Mon, 3 Oct 2022 at 17:53, Junio C Hamano <gitster@pobox.com> wrote:

Show 11 quoted lines

>
> Alastair Douglas <alastair.douglas@gmail.com> writes:
>
> > I have found no solution to the issue below. Apologies if it has
> > already been addressed.
>
> Thanks for a report.
>
> The solution is to remove "[pull] rebase = preserve" and replace it
> with "[pull] rebase = merges", I think.
>

Thanks for this reply. This seems to have worked, since I got no warning.

Now that I know it is a new option to the rebase setting I have found it in the documentation:

branch.<name>.rebase
...
  When merges, pass the --rebase-merges option to git rebase so that
the local merge commits are included in the rebase (see git-rebase(1)
for details).
  When preserve (deprecated in favor of merges), also pass
--preserve-merges along to git rebase so that locally committed merge
commits will not be flattened by running git pull.

It does seem like nobody else on the internet is aware of this, since I didn't discover this by Googling it.

> I also suspect that they were hoping that the users will read the
> instruction based on these command line options and understand that
> it also applies to the configuration variables.
>

I understood immediately that it applied to the config, but I couldn't find a single thing about what I *should* have done until you told me here.

Having said all this, I am fairly sure that I checked the documentation for the rebase config and failed to spot that new part, so I am not blameless myself! I feel like *something* could be updated to point in the right direction, but I really don't know what. Yesterday, I genuinely thought there was no replacement config for the deprecated one!

Thanks for your time, but I suppose, in conclusion, there's not a lot to be done.