From: Junio C Hamano <gitster@pobox.com>
To: Alastair Douglas <alastair.douglas@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Bug report
Date: Mon, 03 Oct 2022 09:53:26 -0700 [thread overview]
Message-ID: <xmqqill0voft.fsf@gitster.g> (raw)
In-Reply-To: <CADTs3HEn8JQzfWGP-rq_BBLvwGD163=c2i_7vFK17g+wAVec+Q@mail.gmail.com> (Alastair Douglas's message of "Mon, 3 Oct 2022 16:28:06 +0100")
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.
> What did you do before the bug happened? (Steps to reproduce your issue)
>
> Have an existing git config with rebase = preserve
>
> What did you expect to happen? (Expected behaviour)
>
> Merges to be preserved when rebasing, without a warning about an option I am
> not using.
>
> What happened instead? (Actual behaviour)
>
> I received a warning as though I had used the option on the command line:
>
> warning: git rebase --preserve-merges is deprecated. Use
> --rebase-merges instead.
>
> I didn't do that, so I can't follow the advice. There appears to be no
> alternative config setting for the new option.
It sounds like splitting hairs, but I agree that the message is
misleading. I think whoever wrote the message meant that "the
feature that is triggered by giving the --preserve-merges option to
the command" was deprecated. IOW, they did not mean that only the
command line option was depreated, implying that it is not
deprecated to trigger the same feature by setting a configuration
variable. Both forms of the use of the same feature was deprecated
about the same time.
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.
next prev parent reply other threads:[~2022-10-03 16:53 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-03 15:28 Bug report Alastair Douglas
2022-10-03 16:53 ` Junio C Hamano [this message]
2022-10-04 10:15 ` Alastair Douglas
2022-10-04 16:53 ` Bug report [die() preserve-merges messages] Philip Oakley
2022-10-05 5:46 ` Bug report Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2024-07-19 18:34 Roman Dvoskin
2024-07-19 20:13 ` brian m. carlson
2024-07-19 20:35 ` Roman Dvoskin
2024-07-19 20:40 ` rsbecker
2023-08-28 12:51 Dexter Pontañeles
2023-06-27 16:02 Bug Report Tiago d'Almeida
2022-12-28 2:43 Bug report Jensen Bean
2022-12-28 5:02 ` Eric Sunshine
2022-12-25 17:26 bug report Eyal Post
2022-12-25 18:12 ` Eric Sunshine
2022-12-08 5:29 Bug Report Jensen Bean
2022-12-08 8:31 ` Bagas Sanjaya
[not found] ` <CANqKdC-gHgQHn5DMoOREY52y7PpRLMpNAjX3qeA5iy9z_GXdzw@mail.gmail.com>
2022-12-26 2:15 ` Bagas Sanjaya
2022-11-19 20:20 Jensen Bean
2022-04-20 19:45 Daniel Habenicht
2022-04-20 21:30 ` brian m. carlson
2022-04-20 22:34 ` rsbecker
2022-04-21 13:20 ` Daniel Habenicht
2022-04-21 14:39 ` Torsten Bögershausen
[not found] ` <AS1P190MB175022A7F1264807ECA464A8ECF49@AS1P190MB1750.EURP190.PROD.OUTLOOK.COM>
2022-04-21 17:52 ` Torsten Bögershausen
2021-12-01 22:31 Josh Rampersad
2021-11-12 4:22 bug report Theodore Li
2021-11-12 4:29 ` Junio C Hamano
2021-11-12 6:59 ` Theodore Li
2021-11-12 14:05 ` Paul Smith
2020-03-27 11:53 Bug Report James Yeoman
2020-03-27 12:59 ` Pratyush Yadav
[not found] <CA+2sEepTyrK-iH+VBHVF1i9DuYVzDkTNxuM0-yoWbkC9N4f8HA@mail.gmail.com>
2019-04-15 15:18 ` bug report Nick Steinhauser
2017-08-30 21:25 Bug report Aleksandar Pavic
2017-08-31 6:36 ` Kevin Daudt
2017-08-31 14:19 ` Dov Grobgeld
2017-08-31 14:55 ` Aleksandar Pavic
2017-08-31 16:23 ` Stephan Beyer
2017-09-02 8:49 ` Jeff King
2016-05-13 5:04 bug report 李本超
2016-05-13 5:23 ` Pranit Bauva
2016-05-13 5:58 ` 李本超
2016-05-13 6:37 ` Pranit Bauva
2016-05-13 6:57 ` 李本超
2016-05-13 7:10 ` Pranit Bauva
2016-05-13 7:41 ` 李本超
2016-05-13 8:10 ` Jeff King
2016-05-13 12:05 ` 李本超
2016-04-03 0:25 Bug Report Benjamin Sandeen
2016-04-03 2:20 ` Eric N. Vander Weele
2016-04-03 2:22 ` Jacob Keller
2015-01-27 14:43 bug report Albert Akhriev
2015-01-27 14:50 ` Jeff King
[not found] <CAC34_pT9zwZDnUjo1bTUZabD02M48=_+77-mNCA5adWTgxuYgg@mail.gmail.com>
2013-04-08 5:20 ` Bug Report Kirk Fraser
2012-10-05 10:13 Bug report Муковников Михаил
2012-10-05 10:32 ` Konstantin Khomoutov
2012-10-05 10:47 ` Carlos Martín Nieto
2012-10-05 11:03 ` Муковников Михаил
2012-10-05 10:52 ` Муковников Михаил
2012-10-04 4:35 John Whitney
2012-10-04 14:19 ` Phil Hord
2012-10-04 16:10 ` John Whitney
2012-10-06 13:31 ` Jeff King
2012-10-07 2:23 ` John Whitney
2012-10-07 23:52 ` Jeff King
2012-10-09 17:17 ` John Whitney
2012-10-09 19:00 ` John Whitney
2012-10-04 15:21 ` Andrew Wong
2012-10-04 16:16 ` John Whitney
2012-10-04 16:28 ` John Whitney
2012-10-04 17:01 ` Andrew Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqill0voft.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=alastair.douglas@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).